X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=af85e0ff08d17fcbf7fd4111ce27988d9fe405dd;hb=7998c12eb59c07f583db27a250ff566b543bf40b;hp=e3ad42560edf82ef0e1870003f46eaa04c5cbfad;hpb=5d65df7ebdc96c658a6b7042e639cb395f91bfeb;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index e3ad42560..af85e0ff0 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,19 +17,33 @@ */ -#include -#include -#include +/** @file src/lib/content.cc + * @brief Content class. + */ + #include "content.h" #include "util.h" #include "content_factory.h" -#include "ui_signaller.h" +#include "exceptions.h" +#include "film.h" +#include "safe_stringstream.h" +#include "job.h" +#include "compose.hpp" +#include "raw_convert.h" +#include +#include +#include +#include + +#include "i18n.h" using std::string; -using std::stringstream; -using std::set; +using std::list; +using std::cout; +using std::vector; +using std::max; +using std::pair; using boost::shared_ptr; -using boost::lexical_cast; int const ContentProperty::PATH = 400; int const ContentProperty::POSITION = 401; @@ -37,8 +51,18 @@ int const ContentProperty::LENGTH = 402; int const ContentProperty::TRIM_START = 403; int const ContentProperty::TRIM_END = 404; -Content::Content (shared_ptr f, Time p) - : _film (f) +Content::Content (shared_ptr film) + : _film (film) + , _position (0) + , _trim_start (0) + , _trim_end (0) + , _change_signals_frequent (false) +{ + +} + +Content::Content (shared_ptr film, DCPTime p) + : _film (film) , _position (p) , _trim_start (0) , _trim_end (0) @@ -47,53 +71,82 @@ Content::Content (shared_ptr f, Time p) } -Content::Content (shared_ptr f, boost::filesystem::path p) - : _film (f) - , _path (p) +Content::Content (shared_ptr film, boost::filesystem::path p) + : _film (film) , _position (0) , _trim_start (0) , _trim_end (0) , _change_signals_frequent (false) { + _paths.push_back (p); +} +Content::Content (shared_ptr film, cxml::ConstNodePtr node) + : _film (film) + , _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->optional_string_child ("Digest").get_value_or ("X"); + _position = DCPTime (node->number_child ("Position")); + _trim_start = ContentTime (node->number_child ("TrimStart")); + _trim_end = ContentTime (node->number_child ("TrimEnd")); } -Content::Content (shared_ptr f, shared_ptr node) - : _film (f) +Content::Content (shared_ptr film, vector > c) + : _film (film) + , _position (c.front()->position ()) + , _trim_start (c.front()->trim_start ()) + , _trim_end (c.back()->trim_end ()) , _change_signals_frequent (false) { - _path = node->string_child ("Path"); - _digest = node->string_child ("Digest"); - _position = node->number_child