X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcontent.cc;h=dbb84120034f441ed2028e2eb63a2836aed8ea48;hb=11325f810e214935e4115248223c186a6e4cc184;hp=786b5fb09be505bcf0bcd56765c41a30b45d0b17;hpb=7fee459e6466354a49d51f61d3e53845fd82ecc7;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 786b5fb09..dbb841200 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -22,41 +22,172 @@ #include #include "content.h" #include "util.h" +#include "content_factory.h" +#include "ui_signaller.h" using std::string; +using std::stringstream; +using std::set; using boost::shared_ptr; +using boost::lexical_cast; -Content::Content (boost::filesystem::path f) - : _file (f) +int const ContentProperty::POSITION = 400; +int const ContentProperty::LENGTH = 401; +int const ContentProperty::TRIM_START = 402; +int const ContentProperty::TRIM_END = 403; + +Content::Content (shared_ptr f, Time p) + : _film (f) + , _position (p) + , _trim_start (0) + , _trim_end (0) + , _change_signals_frequent (false) { } -Content::Content (shared_ptr node) +Content::Content (shared_ptr f, boost::filesystem::path p) + : _film (f) + , _path (p) + , _position (0) + , _trim_start (0) + , _trim_end (0) + , _change_signals_frequent (false) { - _file = node->string_child ("File"); - _digest = node->string_child ("Digest"); + } -Content::Content (Content const & o) - : _file (o._file) - , _digest (o._digest) +Content::Content (shared_ptr f, shared_ptr node) + : _film (f) + , _change_signals_frequent (false) { - + _path = node->string_child ("Path"); + _digest = node->string_child ("Digest"); + _position = node->number_child