X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcontent.cc;h=1fb4681a251b2810c662426912114f6a2af181e7;hb=b666a794a130386bc01ede2143ef40bd6973eb32;hp=578dafd675807fa8a13e8b9ef0a4852638ee6b82;hpb=237a0052c60af768f4d62b00321932918b7ba4d9;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 578dafd67..1fb4681a2 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,5 +1,3 @@ -/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */ - /* Copyright (C) 2013 Carl Hetherington @@ -24,53 +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; -Content::Content (boost::filesystem::path f) - : _file (f) - , _time (0) +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) + : _film (f) + , _position (0) + , _trim_start (0) + , _trim_end (0) + , _change_signals_frequent (false) +{ + +} + +Content::Content (shared_ptr f, DCPTime 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) + , _position (0) + , _trim_start (0) + , _trim_end (0) + , _change_signals_frequent (false) { - _file = node->string_child ("File"); + _paths.push_back (p); +} + +Content::Content (shared_ptr f, shared_ptr node) + : _film (f) + , _change_signals_frequent (false) +{ + 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"); - _time = node->number_child