X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=3ab4a5959a81cbb8ecdc42eca672b822add569c7;hb=723b49e77951d0981b8165f724acd49d9a44660d;hp=ae0b08dccc241f24ba5f4d43f6cfadd658e5b583;hpb=6c7489e5d778d3e71065d88a094a7383ba2c117d;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index ae0b08dcc..3ab4a5959 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" @@ -86,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) @@ -94,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")); @@ -133,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]); } } } @@ -144,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); @@ -157,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 (); @@ -172,10 +180,25 @@ 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 job) +{ + if (job) { + job->sub (_("Computing digest")); + } - lm.lock (); + 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 @@ -205,7 +228,7 @@ Content::set_position (DCPTime p) audio->modify_position (p); } - ContentChange cc (this, ContentProperty::POSITION); + ChangeSignaller cc (this, ContentProperty::POSITION); { boost::mutex::scoped_lock lm (_mutex); @@ -231,7 +254,7 @@ Content::set_trim_start (ContentTime t) audio->modify_trim_start (t); } - ContentChange cc (this, ContentProperty::TRIM_START); + ChangeSignaller cc (this, ContentProperty::TRIM_START); { boost::mutex::scoped_lock lm (_mutex); @@ -242,7 +265,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); @@ -272,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 @@ -298,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; } } @@ -307,19 +334,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 @@ -369,7 +396,7 @@ 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); @@ -385,7 +412,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); @@ -481,3 +508,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)); +}