projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1.0' into 1.0-seek
[dcpomatic.git]
/
src
/
lib
/
content.h
diff --git
a/src/lib/content.h
b/src/lib/content.h
index c066c61e036a047813ecde76a71c2a9d1c9552b6..1eee02e01463e434bd65acd3a1bac53bd7f72170 100644
(file)
--- a/
src/lib/content.h
+++ b/
src/lib/content.h
@@
-48,9
+48,11
@@
public:
class Content : public boost::enable_shared_from_this<Content>, public boost::noncopyable
{
public:
class Content : public boost::enable_shared_from_this<Content>, public boost::noncopyable
{
public:
- Content (boost::shared_ptr<const Film>, Time);
+ Content (boost::shared_ptr<const Film>);
+ Content (boost::shared_ptr<const Film>, DCPTime);
Content (boost::shared_ptr<const Film>, boost::filesystem::path);
Content (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
Content (boost::shared_ptr<const Film>, boost::filesystem::path);
Content (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+ Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
virtual ~Content () {}
virtual void examine (boost::shared_ptr<Job>);
virtual ~Content () {}
virtual void examine (boost::shared_ptr<Job>);
@@
-58,18
+60,30
@@
public:
virtual std::string technical_summary () const;
virtual std::string information () const = 0;
virtual void as_xml (xmlpp::Node *) const;
virtual std::string technical_summary () const;
virtual std::string information () const = 0;
virtual void as_xml (xmlpp::Node *) const;
- virtual Time full_length () const = 0;
+ virtual
DCP
Time full_length () const = 0;
virtual std::string identifier () const;
boost::shared_ptr<Content> clone () const;
void set_path (boost::filesystem::path);
virtual std::string identifier () const;
boost::shared_ptr<Content> clone () const;
void set_path (boost::filesystem::path);
-
- boost::filesystem::path path () const {
+
+ std::string path_summary () const;
+
+ std::vector<boost::filesystem::path> paths () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _paths;
+ }
+
+ size_t number_of_paths () const {
boost::mutex::scoped_lock lm (_mutex);
boost::mutex::scoped_lock lm (_mutex);
- return _path;
+ return _path
s.size ()
;
}
}
+ boost::filesystem::path path (size_t i) const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _paths[i];
+ }
+
bool path_valid () const;
/** @return MD5 digest of the content's file(s) */
bool path_valid () const;
/** @return MD5 digest of the content's file(s) */
@@
-78,41
+92,41
@@
public:
return _digest;
}
return _digest;
}
- void set_position (Time);
+ void set_position (
DCP
Time);
- /** Time that this content starts; i.e. the time that the first
+ /**
DCP
Time that this content starts; i.e. the time that the first
* bit of the content (trimmed or not) will happen.
*/
* bit of the content (trimmed or not) will happen.
*/
- Time position () const {
+
DCP
Time position () const {
boost::mutex::scoped_lock lm (_mutex);
return _position;
}
boost::mutex::scoped_lock lm (_mutex);
return _position;
}
- void set_trim_start (Time);
+ void set_trim_start (
DCP
Time);
- Time trim_start () const {
+
DCP
Time trim_start () const {
boost::mutex::scoped_lock lm (_mutex);
return _trim_start;
}
boost::mutex::scoped_lock lm (_mutex);
return _trim_start;
}
- void set_trim_end (Time);
+ void set_trim_end (
DCP
Time);
- Time trim_end () const {
+
DCP
Time trim_end () const {
boost::mutex::scoped_lock lm (_mutex);
return _trim_end;
}
boost::mutex::scoped_lock lm (_mutex);
return _trim_end;
}
- Time end () const {
- return position() + length_after_trim();
+
DCP
Time end () const {
+ return position() + length_after_trim()
- 1
;
}
}
- Time length_after_trim () const;
+
DCP
Time length_after_trim () const;
void set_change_signals_frequent (bool f) {
_change_signals_frequent = f;
}
void set_change_signals_frequent (bool f) {
_change_signals_frequent = f;
}
- bool trimmed (Time) const;
+ bool trimmed (
DCP
Time) const;
boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
@@
-126,13
+140,14
@@
protected:
*/
mutable boost::mutex _mutex;
*/
mutable boost::mutex _mutex;
+ /** Paths of our data files */
+ std::vector<boost::filesystem::path> _paths;
+
private:
private:
- /** Path of a file or a directory containing files */
- boost::filesystem::path _path;
std::string _digest;
std::string _digest;
- Time _position;
- Time _trim_start;
- Time _trim_end;
+
DCP
Time _position;
+
DCP
Time _trim_start;
+
DCP
Time _trim_end;
bool _change_signals_frequent;
};
bool _change_signals_frequent;
};