X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=49ab944be54c79c3d478469ad09762a9555768fe;hp=a722cd15dae37fde8c2a17554753243d5651aa65;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566 diff --git a/src/lib/content.cc b/src/lib/content.cc index a722cd15d..49ab944be 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. @@ -18,10 +18,12 @@ */ + /** @file src/lib/content.cc * @brief Content class. */ + #include "content.h" #include "change_signaller.h" #include "util.h" @@ -42,18 +44,21 @@ #include "i18n.h" -using std::string; -using std::list; + using std::cout; -using std::vector; +using std::list; +using std::make_shared; using std::max; using std::pair; -using boost::shared_ptr; +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,46 +66,41 @@ 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) + : _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) + : _change_signals_frequent (false) { add_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())) { - _last_write_times.push_back (boost::filesystem::last_write_time(i->content())); } else { - _last_write_times.push_back (0); + boost::system::error_code ec; + auto last_write = boost::filesystem::last_write_time(i->content(), ec); + _last_write_times.push_back (ec ? 0 : last_write); } } _digest = node->optional_string_child ("Digest").get_value_or ("X"); @@ -110,10 +110,11 @@ 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) { @@ -144,6 +145,7 @@ Content::Content (vector > c) } } + void Content::as_xml (xmlpp::Node* node, bool with_paths) const { @@ -151,25 +153,26 @@ 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); - vector p = _paths; + auto p = _paths; lm.unlock (); /* Some content files are very big, so we use a poor man's @@ -179,6 +182,7 @@ Content::calculate_digest () const return digest_head_tail(p, 1000000) + raw_convert(boost::filesystem::file_size(p.front())); } + void Content::examine (shared_ptr, shared_ptr job) { @@ -186,31 +190,35 @@ 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) { - _last_write_times.push_back (boost::filesystem::last_write_time(i)); + for (auto i: _paths) { + boost::system::error_code ec; + auto last_write = boost::filesystem::last_write_time(i, ec); + _last_write_times.push_back (ec ? 0 : last_write); } } + 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, bool force_emit) { @@ -230,7 +238,7 @@ Content::set_position (shared_ptr film, DCPTime p, bool force_emit) audio->modify_position (film, p); } - ChangeSignaller cc (this, ContentProperty::POSITION); + ContentChangeSignaller cc (this, ContentProperty::POSITION); { boost::mutex::scoped_lock lm (_mutex); @@ -243,6 +251,7 @@ Content::set_position (shared_ptr film, DCPTime p, bool force_emit) } } + void Content::set_trim_start (ContentTime t) { @@ -257,7 +266,7 @@ Content::set_trim_start (ContentTime t) audio->modify_trim_start (t); } - ChangeSignaller cc (this, ContentProperty::TRIM_START); + ContentChangeSignaller cc (this, ContentProperty::TRIM_START); { boost::mutex::scoped_lock lm (_mutex); @@ -265,10 +274,11 @@ 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); @@ -282,30 +292,37 @@ 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 (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 { - 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); } return s; } + 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 * the appearance of its video. */ @@ -320,10 +337,11 @@ Content::identifier () const return buffer; } + bool Content::paths_valid () const { - BOOST_FOREACH (boost::filesystem::path i, _paths) { + for (auto i: _paths) { if (!boost::filesystem::exists (i)) { return false; } @@ -332,21 +350,25 @@ Content::paths_valid () const return true; } + 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) { - _last_write_times.push_back (boost::filesystem::last_write_time(i)); + for (auto i: _paths) { + boost::system::error_code ec; + auto last_write = boost::filesystem::last_write_time(i, ec); + _last_write_times.push_back (ec ? 0 : last_write); } } } + string Content::path_summary () const { @@ -354,7 +376,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 += " ..."; } @@ -362,6 +384,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 @@ -371,6 +394,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 @@ -383,10 +407,11 @@ Content::reel_split_points (shared_ptr) const return t; } + 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); @@ -402,10 +427,11 @@ 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); @@ -413,6 +439,7 @@ Content::unset_video_frame_rate () } } + double Content::active_video_frame_rate (shared_ptr film) const { @@ -430,6 +457,7 @@ 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 { @@ -458,6 +486,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) @@ -469,8 +498,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; @@ -478,32 +507,37 @@ 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 { - BOOST_FOREACH (shared_ptr i, text) { + for (auto i: text) { if (i->original_type() == type) { return i; } } - return shared_ptr (); + return {}; } + 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)); + boost::system::error_code ec; + auto last_write = boost::filesystem::last_write_time(p, ec); + _last_write_times.push_back (ec ? 0 : last_write); }