X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=9280d2e612be094566c183ea6a0340b3179e1f5f;hp=3814956d581951c3057a1112b6d9bfef5d0824a0;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=e65d31fbccad80c80f743516ecdd8269826d2114 diff --git a/src/lib/content.cc b/src/lib/content.cc index 3814956d5..9280d2e61 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -23,6 +23,7 @@ */ #include "content.h" +#include "change_signaller.h" #include "util.h" #include "content_factory.h" #include "video_content.h" @@ -59,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) @@ -69,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) @@ -79,23 +78,29 @@ 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) { - _paths.push_back (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"); - 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")); @@ -104,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()) @@ -133,7 +137,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]); } } } @@ -144,8 +149,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); @@ -157,13 +164,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 (); @@ -172,40 +175,65 @@ 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())); +} + +void +Content::examine (shared_ptr, shared_ptr job) +{ + if (job) { + job->sub (_("Computing digest")); + } + + string const d = calculate_digest (); - lm.lock (); + 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)); - } catch (boost::bad_weak_ptr) { + 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 */ } } 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); + /* 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); } - ContentChange cc (this, ContentProperty::POSITION); + ChangeSignaller cc (this, ContentProperty::POSITION); { boost::mutex::scoped_lock lm (_mutex); - if (p == _position) { + if (p == _position && !force_emit) { cc.abort (); return; } @@ -223,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); } - ContentChange cc (this, ContentProperty::TRIM_START); + ChangeSignaller cc (this, ContentProperty::TRIM_START); { boost::mutex::scoped_lock lm (_mutex); @@ -238,7 +267,7 @@ Content::set_trim_start (ContentTime t) void Content::set_trim_end (ContentTime t) { - ContentChange cc (this, ContentProperty::TRIM_END); + ChangeSignaller cc (this, ContentProperty::TRIM_END); { boost::mutex::scoped_lock lm (_mutex); @@ -250,11 +279,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"); @@ -262,19 +286,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 @@ -294,8 +322,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; } } @@ -303,19 +331,19 @@ Content::paths_valid () const return true; } -void -Content::set_path (boost::filesystem::path path) -{ - ContentChange cc (this, ContentProperty::PATH); - _paths.clear (); - _paths.push_back (path); -} - void Content::set_paths (vector paths) { - ContentChange cc (this, ContentProperty::PATH); - _paths = paths; + 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 @@ -335,24 +363,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 @@ -365,16 +385,18 @@ Content::reel_split_points () const void Content::set_video_frame_rate (double r) { - ContentChange cc (this, ContentProperty::VIDEO_FRAME_RATE); + ChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); { 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; } - /* Make sure things are still on frame boundaries */ + /* Make sure trim is still on a frame boundary */ if (video) { - set_position (position()); set_trim_start (trim_start()); } } @@ -382,7 +404,7 @@ Content::set_video_frame_rate (double r) void Content::unset_video_frame_rate () { - ContentChange cc (this, ContentProperty::VIDEO_FRAME_RATE); + ChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); { boost::mutex::scoped_lock lm (_mutex); @@ -391,7 +413,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); @@ -404,13 +426,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 ())); @@ -478,3 +498,11 @@ Content::text_of_original_type (TextType type) const 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)); +}