X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=6324050ec69a22f056cc3bedb4c1c7ae2ff002f0;hb=HEAD;hp=1682b863d8d5ac3154f9a0a0b523042922775bff;hpb=15d98128799c2902a3fc046792d1456a275b756b;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 1682b863d..f13201b93 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -18,21 +18,23 @@ */ + /** @file src/lib/content.cc * @brief Content class. */ -#include "content.h" + +#include "audio_content.h" #include "change_signaller.h" -#include "util.h" +#include "compose.hpp" +#include "content.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" -#include "compose.hpp" +#include "text_content.h" +#include "util.h" +#include "video_content.h" #include #include #include @@ -42,18 +44,19 @@ #include "i18n.h" -using std::string; -using std::list; + using std::cout; -using std::vector; -using std::max; -using std::pair; +using std::list; +using std::make_shared; using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; -using dcp::raw_convert; using dcp::locale_convert; +using dcp::raw_convert; using namespace dcpomatic; + int const ContentProperty::PATH = 400; int const ContentProperty::POSITION = 401; int const ContentProperty::LENGTH = 402; @@ -61,35 +64,27 @@ int const ContentProperty::TRIM_START = 403; int const ContentProperty::TRIM_END = 404; int const ContentProperty::VIDEO_FRAME_RATE = 405; + Content::Content () - : _position (0) - , _trim_start (0) - , _trim_end (0) - , _change_signals_frequent (false) { } + Content::Content (DCPTime p) : _position (p) - , _trim_start (0) - , _trim_end (0) - , _change_signals_frequent (false) { } + Content::Content (boost::filesystem::path p) - : _position (0) - , _trim_start (0) - , _trim_end (0) - , _change_signals_frequent (false) { add_path (p); } + Content::Content (cxml::ConstNodePtr node) - : _change_signals_frequent (false) { for (auto i: node->node_children("Path")) { _paths.push_back (i->content()); @@ -98,7 +93,7 @@ Content::Content (cxml::ConstNodePtr node) _last_write_times.push_back (*mod); } else { boost::system::error_code ec; - auto last_write = boost::filesystem::last_write_time(i->content(), ec); + auto last_write = dcp::filesystem::last_write_time(i->content(), ec); _last_write_times.push_back (ec ? 0 : last_write); } } @@ -109,12 +104,12 @@ Content::Content (cxml::ConstNodePtr node) _video_frame_rate = node->optional_number_child ("VideoFrameRate"); } -Content::Content (vector > c) - : _position (c.front()->position ()) - , _trim_start (c.front()->trim_start ()) - , _trim_end (c.back()->trim_end ()) + +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()) - , _change_signals_frequent (false) { for (size_t i = 0; i < c.size(); ++i) { if (i > 0 && c[i]->trim_start() > ContentTime ()) { @@ -143,6 +138,7 @@ Content::Content (vector > c) } } + void Content::as_xml (xmlpp::Node* node, bool with_paths) const { @@ -150,34 +146,32 @@ Content::as_xml (xmlpp::Node* node, bool with_paths) const if (with_paths) { for (size_t i = 0; i < _paths.size(); ++i) { - xmlpp::Element* p = node->add_child("Path"); + auto 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); - node->add_child("Position")->add_child_text (raw_convert (_position.get ())); - node->add_child("TrimStart")->add_child_text (raw_convert (_trim_start.get ())); - node->add_child("TrimEnd")->add_child_text (raw_convert (_trim_end.get ())); + node->add_child("Digest")->add_child_text(_digest); + node->add_child("Position")->add_child_text(raw_convert(_position.get())); + node->add_child("TrimStart")->add_child_text(raw_convert(_trim_start.get())); + node->add_child("TrimEnd")->add_child_text(raw_convert(_trim_end.get())); if (_video_frame_rate) { - node->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate.get())); + node->add_child("VideoFrameRate")->add_child_text(raw_convert(_video_frame_rate.get())); } } + string Content::calculate_digest () const { - boost::mutex::scoped_lock lm (_mutex); - auto p = _paths; - lm.unlock (); - /* Some content files are very big, so we use a poor man's 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. */ - return digest_head_tail(p, 1000000) + raw_convert(boost::filesystem::file_size(p.front())); + return simple_digest (paths()); } + void Content::examine (shared_ptr, shared_ptr job) { @@ -193,11 +187,12 @@ Content::examine (shared_ptr, shared_ptr job) _last_write_times.clear (); for (auto i: _paths) { boost::system::error_code ec; - auto last_write = boost::filesystem::last_write_time(i, ec); + auto last_write = dcp::filesystem::last_write_time(i, ec); _last_write_times.push_back (ec ? 0 : last_write); } } + void Content::signal_change (ChangeType c, int p) { @@ -212,6 +207,7 @@ Content::signal_change (ChangeType c, int p) } } + void Content::set_position (shared_ptr film, DCPTime p, bool force_emit) { @@ -244,9 +240,12 @@ Content::set_position (shared_ptr film, DCPTime p, bool force_emit) } } + void -Content::set_trim_start (ContentTime t) +Content::set_trim_start(shared_ptr film, ContentTime t) { + DCPOMATIC_ASSERT (t.get() >= 0); + /* video and audio content can modify its start trim */ if (video) { @@ -255,20 +254,27 @@ Content::set_trim_start (ContentTime t) /* See note in ::set_position */ if (!video && audio) { - audio->modify_trim_start (t); + audio->modify_trim_start(film, t); } ContentChangeSignaller cc (this, ContentProperty::TRIM_START); { boost::mutex::scoped_lock lm (_mutex); - _trim_start = t; + if (_trim_start == t) { + cc.abort(); + } else { + _trim_start = t; + } } } + void Content::set_trim_end (ContentTime t) { + DCPOMATIC_ASSERT (t.get() >= 0); + ContentChangeSignaller cc (this, ContentProperty::TRIM_END); { @@ -288,9 +294,10 @@ Content::clone () const /* notes is unused here (we assume) */ list notes; - return content_factory (cxml::NodePtr(new cxml::Node(node)), Film::current_state_version, notes); + return content_factory (make_shared(node), Film::current_state_version, notes); } + string Content::technical_summary () const { @@ -301,6 +308,7 @@ Content::technical_summary () const return s; } + DCPTime Content::length_after_trim (shared_ptr film) const { @@ -311,6 +319,7 @@ Content::length_after_trim (shared_ptr film) const return length; } + /** @return string which changes when something about this content changes which affects * the appearance of its video. */ @@ -325,11 +334,12 @@ Content::identifier () const return buffer; } + bool Content::paths_valid () const { for (auto i: _paths) { - if (!boost::filesystem::exists (i)) { + if (!dcp::filesystem::exists(i)) { return false; } } @@ -337,6 +347,7 @@ Content::paths_valid () const return true; } + void Content::set_paths (vector paths) { @@ -348,12 +359,13 @@ Content::set_paths (vector paths) _last_write_times.clear (); for (auto i: _paths) { boost::system::error_code ec; - auto last_write = boost::filesystem::last_write_time(i, ec); + auto last_write = dcp::filesystem::last_write_time(i, ec); _last_write_times.push_back (ec ? 0 : last_write); } } } + string Content::path_summary () const { @@ -369,6 +381,7 @@ Content::path_summary () const return s; } + /** @return a list of properties that might be interesting to the user */ list Content::user_properties (shared_ptr film) const @@ -378,6 +391,7 @@ Content::user_properties (shared_ptr film) const return p; } + /** @return DCP times of points within this content where a reel split could occur */ list Content::reel_split_points (shared_ptr) const @@ -390,8 +404,9 @@ Content::reel_split_points (shared_ptr) const return t; } + void -Content::set_video_frame_rate (double r) +Content::set_video_frame_rate(shared_ptr film, double r) { ContentChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE); @@ -405,10 +420,11 @@ Content::set_video_frame_rate (double r) /* Make sure trim is still on a frame boundary */ if (video) { - set_trim_start (trim_start()); + set_trim_start(film, trim_start()); } } + void Content::unset_video_frame_rate () { @@ -420,6 +436,7 @@ Content::unset_video_frame_rate () } } + double Content::active_video_frame_rate (shared_ptr film) const { @@ -437,10 +454,28 @@ Content::active_video_frame_rate (shared_ptr film) const return film->active_frame_rate_change(position()).source; } + void Content::add_properties (shared_ptr, list& p) const { - p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ())); + auto paths_to_show = std::min(number_of_paths(), size_t{8}); + string paths = ""; + for (auto i = size_t{0}; i < paths_to_show; ++i) { + paths += path(i).string(); + if (i < (paths_to_show - 1)) { + paths += "\n"; + } + } + if (paths_to_show < number_of_paths()) { + paths += String::compose("... and %1 more", number_of_paths() - paths_to_show); + } + p.push_back ( + UserProperty( + UserProperty::GENERAL, + paths_to_show > 1 ? _("Filenames") : _("Filename"), + paths + ) + ); if (_video_frame_rate) { if (video) { @@ -465,6 +500,7 @@ Content::add_properties (shared_ptr, list& p) const } } + /** Take settings from the given content if it is of the correct type */ void Content::take_settings_from (shared_ptr c) @@ -485,16 +521,18 @@ Content::take_settings_from (shared_ptr c) } } + shared_ptr Content::only_text () const { DCPOMATIC_ASSERT (text.size() < 2); - if (text.empty ()) { - return shared_ptr (); + if (text.empty()) { + return {}; } return text.front (); } + shared_ptr Content::text_of_original_type (TextType type) const { @@ -504,15 +542,39 @@ Content::text_of_original_type (TextType type) const } } - return shared_ptr (); + return {}; } + void Content::add_path (boost::filesystem::path p) { boost::mutex::scoped_lock lm (_mutex); _paths.push_back (p); boost::system::error_code ec; - auto last_write = boost::filesystem::last_write_time(p, ec); + auto last_write = dcp::filesystem::last_write_time(p, ec); _last_write_times.push_back (ec ? 0 : last_write); } + + +bool +Content::changed () const +{ + bool write_time_changed = false; + for (auto i = 0U; i < _paths.size(); ++i) { + if (dcp::filesystem::last_write_time(_paths[i]) != last_write_time(i)) { + write_time_changed = true; + break; + } + } + + return (write_time_changed || calculate_digest() != digest()); +} + + +bool +Content::has_mapped_audio() const +{ + return audio && !audio->mapping().mapped_output_channels().empty(); +} +