projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename next -> position in decoders.
[dcpomatic.git]
/
src
/
lib
/
content.h
diff --git
a/src/lib/content.h
b/src/lib/content.h
index d39fc9e1ac99d3ca1de4ebd2ad4ab6b475567f5a..5e8f98428dd1314b68f3551617a0f576c9e3a11e 100644
(file)
--- a/
src/lib/content.h
+++ b/
src/lib/content.h
@@
-1,3
+1,5
@@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
@@
-25,6
+27,7
@@
#include <boost/thread/mutex.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <libxml++/libxml++.h>
#include <boost/thread/mutex.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <libxml++/libxml++.h>
+#include "types.h"
namespace cxml {
class Node;
namespace cxml {
class Node;
@@
-33,19
+36,28
@@
namespace cxml {
class Job;
class Film;
class Job;
class Film;
+class ContentProperty
+{
+public:
+ static int const START;
+ static int const LENGTH;
+};
+
class Content : public boost::enable_shared_from_this<Content>
{
public:
class Content : public boost::enable_shared_from_this<Content>
{
public:
- Content (boost::filesystem::path);
- Content (boost::shared_ptr<const cxml::Node>);
+ Content (boost::shared_ptr<const Film>, Time);
+ Content (boost::shared_ptr<const Film>, boost::filesystem::path);
+ Content (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
Content (Content const &);
Content (Content const &);
- virtual void examine (boost::shared_ptr<
Film>, boost::shared_ptr<Job>, bool
);
+ virtual void examine (boost::shared_ptr<
Job>
);
virtual std::string summary () const = 0;
virtual std::string information () const = 0;
virtual void as_xml (xmlpp::Node *) const;
virtual boost::shared_ptr<Content> clone () const = 0;
virtual std::string summary () const = 0;
virtual std::string information () const = 0;
virtual void as_xml (xmlpp::Node *) const;
virtual boost::shared_ptr<Content> clone () const = 0;
-
+ virtual Time length () const = 0;
+
boost::filesystem::path file () const {
boost::mutex::scoped_lock lm (_mutex);
return _file;
boost::filesystem::path file () const {
boost::mutex::scoped_lock lm (_mutex);
return _file;
@@
-56,16
+68,29
@@
public:
return _digest;
}
return _digest;
}
+ void set_start (Time);
+
+ Time start () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _start;
+ }
+
+ Time end () const {
+ return start() + length();
+ }
+
boost::signals2::signal<void (boost::weak_ptr<Content>, int)> Changed;
protected:
void signal_changed (int);
boost::signals2::signal<void (boost::weak_ptr<Content>, int)> Changed;
protected:
void signal_changed (int);
-
+
+ boost::weak_ptr<const Film> _film;
mutable boost::mutex _mutex;
private:
boost::filesystem::path _file;
std::string _digest;
mutable boost::mutex _mutex;
private:
boost::filesystem::path _file;
std::string _digest;
+ Time _start;
};
#endif
};
#endif