X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=3ab4a5959a81cbb8ecdc42eca672b822add569c7;hb=475f587f08a7cb1b915be37050abc0b09f6bfc67;hp=a27032e9c135efaed177a39b3594d91a3937e6a9;hpb=3412af70b950dcdc604413ef05c26becda6da789;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index a27032e9c..3ab4a5959 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -23,8 +23,12 @@ */ #include "content.h" +#include "change_signaller.h" #include "util.h" #include "content_factory.h" +#include "video_content.h" +#include "audio_content.h" +#include "text_content.h" #include "exceptions.h" #include "film.h" #include "job.h" @@ -45,6 +49,7 @@ using std::vector; using std::max; using std::pair; using boost::shared_ptr; +using boost::optional; using dcp::raw_convert; using dcp::locale_convert; @@ -82,7 +87,7 @@ Content::Content (shared_ptr film, boost::filesystem::path p) , _trim_end (0) , _change_signals_frequent (false) { - _paths.push_back (p); + add_path (p); } Content::Content (shared_ptr film, cxml::ConstNodePtr node) @@ -90,8 +95,16 @@ Content::Content (shared_ptr film, cxml::ConstNodePtr node) , _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 ()); + BOOST_FOREACH (cxml::NodePtr i, path_children) { + _paths.push_back (i->content()); + optional const mod = i->optional_number_attribute("mtime"); + if (mod) { + _last_write_times.push_back (*mod); + } else if (boost::filesystem::exists(i->content())) { + _last_write_times.push_back (boost::filesystem::last_write_time(i->content())); + } else { + _last_write_times.push_back (0); + } } _digest = node->optional_string_child ("Digest").get_value_or ("X"); _position = DCPTime (node->number_child ("Position")); @@ -129,7 +142,8 @@ Content::Content (shared_ptr film, vector > c) } for (size_t j = 0; j < c[i]->number_of_paths(); ++j) { - _paths.push_back (c[i]->path (j)); + _paths.push_back (c[i]->path(j)); + _last_write_times.push_back (c[i]->_last_write_times[j]); } } } @@ -140,8 +154,10 @@ Content::as_xml (xmlpp::Node* node, bool with_paths) const boost::mutex::scoped_lock lm (_mutex); if (with_paths) { - for (vector::const_iterator i = _paths.begin(); i != _paths.end(); ++i) { - node->add_child("Path")->add_child_text (i->string ()); + for (size_t i = 0; i < _paths.size(); ++i) { + xmlpp::Element* p = node->add_child("Path"); + p->add_child_text (_paths[i].string()); + p->set_attribute ("mtime", raw_convert(_last_write_times[i])); } } node->add_child("Digest")->add_child_text (_digest); @@ -153,13 +169,9 @@ Content::as_xml (xmlpp::Node* node, bool with_paths) const } } -void -Content::examine (shared_ptr job) +string +Content::calculate_digest () const { - if (job) { - job->sub (_("Computing digest")); - } - boost::mutex::scoped_lock lm (_mutex); vector p = _paths; lm.unlock (); @@ -168,17 +180,36 @@ Content::examine (shared_ptr job) digest here: a digest of the first and last 1e6 bytes with the size of the first file tacked on the end as a string. */ - string const d = digest_head_tail (p, 1000000) + raw_convert (boost::filesystem::file_size (p.front ())); + return digest_head_tail(p, 1000000) + raw_convert(boost::filesystem::file_size(p.front())); +} - lm.lock (); +void +Content::examine (shared_ptr job) +{ + if (job) { + job->sub (_("Computing digest")); + } + + string const d = calculate_digest (); + + boost::mutex::scoped_lock lm (_mutex); _digest = d; + + _last_write_times.clear (); + BOOST_FOREACH (boost::filesystem::path i, _paths) { + _last_write_times.push_back (boost::filesystem::last_write_time(i)); + } } void -Content::signal_changed (int p) +Content::signal_change (ChangeType c, int p) { try { - emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); + if (c == CHANGE_TYPE_PENDING || c == CHANGE_TYPE_CANCELLED) { + Change (c, shared_from_this(), p, _change_signals_frequent); + } else { + emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent)); + } } catch (boost::bad_weak_ptr) { /* This must be during construction; never mind */ } @@ -187,38 +218,59 @@ Content::signal_changed (int p) void Content::set_position (DCPTime p) { + /* video and audio content can modify its position */ + + if (video) { + video->modify_position (p); + } + + if (audio) { + audio->modify_position (p); + } + + ChangeSignaller cc (this, ContentProperty::POSITION); + { boost::mutex::scoped_lock lm (_mutex); if (p == _position) { + cc.abort (); return; } _position = p; } - - signal_changed (ContentProperty::POSITION); } void Content::set_trim_start (ContentTime t) { + /* video and audio content can modify its start trim */ + + if (video) { + video->modify_trim_start (t); + } + + if (audio) { + audio->modify_trim_start (t); + } + + ChangeSignaller cc (this, ContentProperty::TRIM_START); + { boost::mutex::scoped_lock lm (_mutex); _trim_start = t; } - - signal_changed (ContentProperty::TRIM_START); } void Content::set_trim_end (ContentTime t) { + ChangeSignaller cc (this, ContentProperty::TRIM_END); + { boost::mutex::scoped_lock lm (_mutex); _trim_end = t; } - - signal_changed (ContentProperty::TRIM_END); } @@ -233,7 +285,7 @@ Content::clone () const /* This is a bit naughty, but I can't think of a compelling reason not to do it ... */ xmlpp::Document doc; xmlpp::Node* node = doc.create_root_node ("Content"); - as_xml (node); + as_xml (node, true); /* notes is unused here (we assume) */ list notes; @@ -243,7 +295,11 @@ Content::clone () const string Content::technical_summary () const { - return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds()); + string s = String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds()); + if (_video_frame_rate) { + s += String::compose(" %1", *_video_frame_rate); + } + return s; } DCPTime @@ -269,8 +325,8 @@ Content::identifier () const bool Content::paths_valid () const { - for (vector::const_iterator i = _paths.begin(); i != _paths.end(); ++i) { - if (!boost::filesystem::exists (*i)) { + BOOST_FOREACH (boost::filesystem::path i, _paths) { + if (!boost::filesystem::exists (i)) { return false; } } @@ -279,11 +335,18 @@ Content::paths_valid () const } void -Content::set_path (boost::filesystem::path path) +Content::set_paths (vector paths) { - _paths.clear (); - _paths.push_back (path); - signal_changed (ContentProperty::PATH); + ChangeSignaller cc (this, ContentProperty::PATH); + + { + boost::mutex::scoped_lock lm (_mutex); + _paths = paths; + _last_write_times.clear (); + BOOST_FOREACH (boost::filesystem::path i, _paths) { + _last_write_times.push_back (boost::filesystem::last_write_time(i)); + } + } } string @@ -323,20 +386,38 @@ list Content::reel_split_points () const { list t; - /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */ - t.push_back (position().round_up (film()->video_frame_rate())); + /* This is only called for video content and such content has its position forced + to start on a frame boundary. + */ + t.push_back (position()); return t; } void Content::set_video_frame_rate (double r) { + ChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); + { boost::mutex::scoped_lock lm (_mutex); _video_frame_rate = r; } - signal_changed (ContentProperty::VIDEO_FRAME_RATE); + /* Make sure trim is still on a frame boundary */ + if (video) { + set_trim_start (trim_start()); + } +} + +void +Content::unset_video_frame_rate () +{ + ChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); + + { + boost::mutex::scoped_lock lm (_mutex); + _video_frame_rate = optional(); + } } double @@ -385,3 +466,53 @@ Content::add_properties (list& p) const } } } + +/** Take settings from the given content if it is of the correct type */ +void +Content::take_settings_from (shared_ptr c) +{ + if (video && c->video) { + video->take_settings_from (c->video); + } + if (audio && c->audio) { + audio->take_settings_from (c->audio); + } + + list >::iterator i = text.begin (); + list >::const_iterator j = c->text.begin (); + while (i != text.end() && j != c->text.end()) { + (*i)->take_settings_from (*j); + ++i; + ++j; + } +} + +shared_ptr +Content::only_text () const +{ + DCPOMATIC_ASSERT (text.size() < 2); + if (text.empty ()) { + return shared_ptr (); + } + return text.front (); +} + +shared_ptr +Content::text_of_original_type (TextType type) const +{ + BOOST_FOREACH (shared_ptr i, text) { + if (i->original_type() == type) { + return i; + } + } + + return shared_ptr (); +} + +void +Content::add_path (boost::filesystem::path p) +{ + boost::mutex::scoped_lock lm (_mutex); + _paths.push_back (p); + _last_write_times.push_back (boost::filesystem::last_write_time(p)); +}