X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcontent.cc;h=1fb4681a251b2810c662426912114f6a2af181e7;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=6a33e9f7e27ce8961ce6439d648138cf891af7ce;hpb=6166c045a8de42edd09924fdd995a77a3b753e54;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 6a33e9f7e..1fb4681a2 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -22,77 +22,244 @@ #include #include "content.h" #include "util.h" +#include "content_factory.h" +#include "ui_signaller.h" +#include "exceptions.h" +#include "film.h" + +#include "i18n.h" using std::string; +using std::stringstream; +using std::set; +using std::list; +using std::cout; +using std::vector; using boost::shared_ptr; using boost::lexical_cast; -int const ContentProperty::START = 400; -int const ContentProperty::LENGTH = 401; +int const ContentProperty::PATH = 400; +int const ContentProperty::POSITION = 401; +int const ContentProperty::LENGTH = 402; +int const ContentProperty::TRIM_START = 403; +int const ContentProperty::TRIM_END = 404; -Content::Content (shared_ptr f, Time s) +Content::Content (shared_ptr f) : _film (f) - , _start (s) + , _position (0) + , _trim_start (0) + , _trim_end (0) + , _change_signals_frequent (false) { } -Content::Content (shared_ptr f, boost::filesystem::path p) +Content::Content (shared_ptr f, DCPTime p) : _film (f) - , _file (p) - , _start (0) + , _position (p) + , _trim_start (0) + , _trim_end (0) + , _change_signals_frequent (false) { } +Content::Content (shared_ptr f, boost::filesystem::path p) + : _film (f) + , _position (0) + , _trim_start (0) + , _trim_end (0) + , _change_signals_frequent (false) +{ + _paths.push_back (p); +} + Content::Content (shared_ptr f, shared_ptr node) : _film (f) + , _change_signals_frequent (false) { - _file = node->string_child ("File"); + list path_children = node->node_children ("Path"); + for (list::const_iterator i = path_children.begin(); i != path_children.end(); ++i) { + _paths.push_back ((*i)->content ()); + } _digest = node->string_child ("Digest"); - _start = node->number_child