X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=2ca029d5ae321d9b4f8019b4ac2d031383f70192;hb=aafa1cc676b6bd4d333f0ff3a09e1effabf979c3;hp=c2cb7e005969327fc94e54cc40be3ef912e6153e;hpb=ef2acd1e5a069fd5b4a332f1b1487ac55ec1a25a;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index c2cb7e005..2ca029d5a 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -60,9 +60,8 @@ int const ContentProperty::TRIM_START = 403; int const ContentProperty::TRIM_END = 404; int const ContentProperty::VIDEO_FRAME_RATE = 405; -Content::Content (shared_ptr film) - : _film (film) - , _position (0) +Content::Content () + : _position (0) , _trim_start (0) , _trim_end (0) , _change_signals_frequent (false) @@ -70,9 +69,8 @@ Content::Content (shared_ptr film) } -Content::Content (shared_ptr film, DCPTime p) - : _film (film) - , _position (p) +Content::Content (DCPTime p) + : _position (p) , _trim_start (0) , _trim_end (0) , _change_signals_frequent (false) @@ -80,9 +78,8 @@ Content::Content (shared_ptr film, DCPTime p) } -Content::Content (shared_ptr film, boost::filesystem::path p) - : _film (film) - , _position (0) +Content::Content (boost::filesystem::path p) + : _position (0) , _trim_start (0) , _trim_end (0) , _change_signals_frequent (false) @@ -90,9 +87,8 @@ Content::Content (shared_ptr film, boost::filesystem::path p) add_path (p); } -Content::Content (shared_ptr film, cxml::ConstNodePtr node) - : _film (film) - , _change_signals_frequent (false) +Content::Content (cxml::ConstNodePtr node) + : _change_signals_frequent (false) { list path_children = node->node_children ("Path"); BOOST_FOREACH (cxml::NodePtr i, path_children) { @@ -113,9 +109,8 @@ Content::Content (shared_ptr film, cxml::ConstNodePtr node) _video_frame_rate = node->optional_number_child ("VideoFrameRate"); } -Content::Content (shared_ptr film, vector > c) - : _film (film) - , _position (c.front()->position ()) +Content::Content (vector > c) + : _position (c.front()->position ()) , _trim_start (c.front()->trim_start ()) , _trim_end (c.back()->trim_end ()) , _video_frame_rate (c.front()->video_frame_rate()) @@ -184,7 +179,7 @@ Content::calculate_digest () const } void -Content::examine (shared_ptr job) +Content::examine (shared_ptr, shared_ptr job) { if (job) { job->sub (_("Computing digest")); @@ -210,29 +205,29 @@ Content::signal_change (ChangeType c, int p) } else { emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent)); } - } catch (boost::bad_weak_ptr) { + } catch (boost::bad_weak_ptr &) { /* This must be during construction; never mind */ } } void -Content::set_position (DCPTime p) +Content::set_position (shared_ptr film, DCPTime p, bool force_emit) { /* video and audio content can modify its position */ if (video) { - video->modify_position (p); + video->modify_position (film, p); } if (audio) { - audio->modify_position (p); + audio->modify_position (film, p); } ChangeSignaller cc (this, ContentProperty::POSITION); { boost::mutex::scoped_lock lm (_mutex); - if (p == _position) { + if (p == _position && !force_emit) { cc.abort (); return; } @@ -277,11 +272,6 @@ Content::set_trim_end (ContentTime t) shared_ptr Content::clone () const { - shared_ptr film = _film.lock (); - if (!film) { - return shared_ptr (); - } - /* 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"); @@ -289,19 +279,23 @@ Content::clone () const /* 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 { - 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 -Content::length_after_trim () const +Content::length_after_trim (shared_ptr film) const { - return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film()->active_frame_rate_change (position ()))); + return max (DCPTime(), full_length(film) - DCPTime(trim_start() + trim_end(), film->active_frame_rate_change(position()))); } /** @return string which changes when something about this content changes which affects @@ -362,24 +356,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; } -shared_ptr -Content::film () const -{ - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - return film; -} - /** @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 @@ -396,6 +382,9 @@ Content::set_video_frame_rate (double r) { boost::mutex::scoped_lock lm (_mutex); + if (_video_frame_rate && fabs(r - *_video_frame_rate) < VIDEO_FRAME_RATE_EPSILON) { + cc.abort(); + } _video_frame_rate = r; } @@ -417,7 +406,7 @@ Content::unset_video_frame_rate () } double -Content::active_video_frame_rate () const +Content::active_video_frame_rate (shared_ptr film) const { { boost::mutex::scoped_lock lm (_mutex); @@ -430,13 +419,11 @@ Content::active_video_frame_rate () const prepared for any concurrent video content or perhaps just the DCP rate. */ - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); return film->active_frame_rate_change(position()).source; } 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 ()));