X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=0171563ae5d041d1fb9ee97812bd17e8b2c2bf6f;hb=b539d468acc3ca73cc58a4434002e511a4995f7d;hp=5139eb4cc57557a828dc14f58da879baa573cec4;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 5139eb4cc..0171563ae 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -48,10 +48,11 @@ using std::cout; using std::vector; using std::max; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using dcp::raw_convert; using dcp::locale_convert; +using namespace dcpomatic; int const ContentProperty::PATH = 400; int const ContentProperty::POSITION = 401; @@ -90,10 +91,9 @@ Content::Content (boost::filesystem::path p) Content::Content (cxml::ConstNodePtr node) : _change_signals_frequent (false) { - list path_children = node->node_children ("Path"); - BOOST_FOREACH (cxml::NodePtr i, path_children) { + for (auto i: node->node_children("Path")) { _paths.push_back (i->content()); - optional const mod = i->optional_number_attribute("mtime"); + auto const mod = i->optional_number_attribute("mtime"); if (mod) { _last_write_times.push_back (*mod); } else if (boost::filesystem::exists(i->content())) { @@ -168,7 +168,7 @@ string Content::calculate_digest () const { boost::mutex::scoped_lock lm (_mutex); - vector p = _paths; + auto p = _paths; lm.unlock (); /* Some content files are very big, so we use a poor man's @@ -185,13 +185,13 @@ Content::examine (shared_ptr, shared_ptr job) job->sub (_("Computing digest")); } - string const d = calculate_digest (); + auto const d = calculate_digest (); boost::mutex::scoped_lock lm (_mutex); _digest = d; _last_write_times.clear (); - BOOST_FOREACH (boost::filesystem::path i, _paths) { + for (auto i: _paths) { _last_write_times.push_back (boost::filesystem::last_write_time(i)); } } @@ -200,18 +200,18 @@ void Content::signal_change (ChangeType c, int p) { try { - if (c == CHANGE_TYPE_PENDING || c == CHANGE_TYPE_CANCELLED) { + if (c == ChangeType::PENDING || c == ChangeType::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) { + } catch (std::bad_weak_ptr &) { /* This must be during construction; never mind */ } } void -Content::set_position (shared_ptr film, DCPTime p) +Content::set_position (shared_ptr film, DCPTime p, bool force_emit) { /* video and audio content can modify its position */ @@ -219,15 +219,21 @@ Content::set_position (shared_ptr film, DCPTime p) video->modify_position (film, p); } - if (audio) { + /* Only allow the audio to modify if we have no video; + sometimes p can't be on an integer video AND audio frame, + and in these cases we want the video constraint to be + satisfied since (I think) the audio code is better able to + cope. + */ + if (!video && audio) { audio->modify_position (film, p); } - ChangeSignaller cc (this, ContentProperty::POSITION); + ContentChangeSignaller cc (this, ContentProperty::POSITION); { boost::mutex::scoped_lock lm (_mutex); - if (p == _position) { + if (p == _position && !force_emit) { cc.abort (); return; } @@ -245,11 +251,12 @@ Content::set_trim_start (ContentTime t) video->modify_trim_start (t); } - if (audio) { + /* See note in ::set_position */ + if (!video && audio) { audio->modify_trim_start (t); } - ChangeSignaller cc (this, ContentProperty::TRIM_START); + ContentChangeSignaller cc (this, ContentProperty::TRIM_START); { boost::mutex::scoped_lock lm (_mutex); @@ -260,7 +267,7 @@ Content::set_trim_start (ContentTime t) void Content::set_trim_end (ContentTime t) { - ChangeSignaller cc (this, ContentProperty::TRIM_END); + ContentChangeSignaller cc (this, ContentProperty::TRIM_END); { boost::mutex::scoped_lock lm (_mutex); @@ -270,22 +277,22 @@ Content::set_trim_end (ContentTime t) shared_ptr -Content::clone (shared_ptr film) const +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"); + auto node = doc.create_root_node ("Content"); as_xml (node, true); /* notes is unused here (we assume) */ list notes; - return content_factory (film, cxml::NodePtr(new cxml::Node(node)), Film::current_state_version, notes); + return content_factory (cxml::NodePtr(new cxml::Node(node)), Film::current_state_version, notes); } string Content::technical_summary () const { - string s = String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds()); + auto s = String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds()); if (_video_frame_rate) { s += String::compose(" %1", *_video_frame_rate); } @@ -295,7 +302,11 @@ Content::technical_summary () const DCPTime Content::length_after_trim (shared_ptr film) const { - return max (DCPTime(), full_length(film) - DCPTime(trim_start() + trim_end(), film->active_frame_rate_change(position()))); + auto length = max(DCPTime(), full_length(film) - DCPTime(trim_start() + trim_end(), film->active_frame_rate_change(position()))); + if (video) { + length = length.round(film->video_frame_rate()); + } + return length; } /** @return string which changes when something about this content changes which affects @@ -315,7 +326,7 @@ Content::identifier () const bool Content::paths_valid () const { - BOOST_FOREACH (boost::filesystem::path i, _paths) { + for (auto i: _paths) { if (!boost::filesystem::exists (i)) { return false; } @@ -327,13 +338,13 @@ Content::paths_valid () const void Content::set_paths (vector paths) { - ChangeSignaller cc (this, ContentProperty::PATH); + ContentChangeSignaller cc (this, ContentProperty::PATH); { boost::mutex::scoped_lock lm (_mutex); _paths = paths; _last_write_times.clear (); - BOOST_FOREACH (boost::filesystem::path i, _paths) { + for (auto i: _paths) { _last_write_times.push_back (boost::filesystem::last_write_time(i)); } } @@ -346,7 +357,7 @@ Content::path_summary () const DCPOMATIC_ASSERT (number_of_paths ()); - string s = path(0).filename().string (); + auto s = path(0).filename().string(); if (number_of_paths() > 1) { s += " ..."; } @@ -356,16 +367,16 @@ Content::path_summary () const /** @return a list of properties that might be interesting to the user */ list -Content::user_properties () const +Content::user_properties (shared_ptr film) const { list p; - add_properties (p); + add_properties (film, p); return p; } /** @return DCP times of points within this content where a reel split could occur */ list -Content::reel_split_points () const +Content::reel_split_points (shared_ptr) const { list t; /* This is only called for video content and such content has its position forced @@ -378,7 +389,7 @@ Content::reel_split_points () const void Content::set_video_frame_rate (double r) { - ChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); + ContentChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); { boost::mutex::scoped_lock lm (_mutex); @@ -397,7 +408,7 @@ Content::set_video_frame_rate (double r) void Content::unset_video_frame_rate () { - ChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); + ContentChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); { boost::mutex::scoped_lock lm (_mutex); @@ -423,7 +434,7 @@ Content::active_video_frame_rate (shared_ptr film) const } void -Content::add_properties (list& p) const +Content::add_properties (shared_ptr, list& p) const { p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ())); @@ -461,8 +472,8 @@ Content::take_settings_from (shared_ptr c) audio->take_settings_from (c->audio); } - list >::iterator i = text.begin (); - list >::const_iterator j = c->text.begin (); + auto i = text.begin (); + auto j = c->text.begin (); while (i != text.end() && j != c->text.end()) { (*i)->take_settings_from (*j); ++i; @@ -483,7 +494,7 @@ Content::only_text () const shared_ptr Content::text_of_original_type (TextType type) const { - BOOST_FOREACH (shared_ptr i, text) { + for (auto i: text) { if (i->original_type() == type) { return i; }