X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=f09012765a7cbe7616d1e2ae40a870981b74604a;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=531dbc38f0677bb8eb1b74354f14eb4788cf3395;hpb=e5da5518951e91f7bfb80718c9cf546e3ece059c;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 531dbc38f..f09012765 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -23,75 +23,162 @@ #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, Time 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