X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=3814956d581951c3057a1112b6d9bfef5d0824a0;hb=e65d31fbccad80c80f743516ecdd8269826d2114;hp=b64e68c4b1739e0dec621877349971815ff93f49;hpb=a306df9145d16046e51e8b7ff5222e341e98fdbd;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index b64e68c4b..3814956d5 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -25,12 +25,15 @@ #include "content.h" #include "util.h" #include "content_factory.h" +#include "video_content.h" +#include "audio_content.h" +#include "text_content.h" #include "exceptions.h" #include "film.h" -#include "safe_stringstream.h" #include "job.h" #include "compose.hpp" -#include "raw_convert.h" +#include +#include #include #include #include @@ -45,6 +48,9 @@ using std::vector; using std::max; using std::pair; using boost::shared_ptr; +using boost::optional; +using dcp::raw_convert; +using dcp::locale_convert; int const ContentProperty::PATH = 400; int const ContentProperty::POSITION = 401; @@ -133,12 +139,14 @@ Content::Content (shared_ptr film, vector > c) } void -Content::as_xml (xmlpp::Node* node) const +Content::as_xml (xmlpp::Node* node, bool with_paths) const { boost::mutex::scoped_lock lm (_mutex); - for (vector::const_iterator i = _paths.begin(); i != _paths.end(); ++i) { - node->add_child("Path")->add_child_text (i->string ()); + if (with_paths) { + for (vector::const_iterator i = _paths.begin(); i != _paths.end(); ++i) { + node->add_child("Path")->add_child_text (i->string ()); + } } node->add_child("Digest")->add_child_text (_digest); node->add_child("Position")->add_child_text (raw_convert (_position.get ())); @@ -174,7 +182,7 @@ void Content::signal_changed (int p) { try { - emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); + emit (boost::bind (boost::ref(Changed), shared_from_this(), p, _change_signals_frequent)); } catch (boost::bad_weak_ptr) { /* This must be during construction; never mind */ } @@ -183,38 +191,59 @@ Content::signal_changed (int p) void Content::set_position (DCPTime p) { + /* video and audio content can modify its position */ + + if (video) { + video->modify_position (p); + } + + if (audio) { + audio->modify_position (p); + } + + ContentChange cc (this, ContentProperty::POSITION); + { boost::mutex::scoped_lock lm (_mutex); if (p == _position) { + cc.abort (); return; } _position = p; } - - signal_changed (ContentProperty::POSITION); } void Content::set_trim_start (ContentTime t) { + /* video and audio content can modify its start trim */ + + if (video) { + video->modify_trim_start (t); + } + + if (audio) { + audio->modify_trim_start (t); + } + + ContentChange cc (this, ContentProperty::TRIM_START); + { boost::mutex::scoped_lock lm (_mutex); _trim_start = t; } - - signal_changed (ContentProperty::TRIM_START); } void Content::set_trim_end (ContentTime t) { + ContentChange cc (this, ContentProperty::TRIM_END); + { boost::mutex::scoped_lock lm (_mutex); _trim_end = t; } - - signal_changed (ContentProperty::TRIM_END); } @@ -229,7 +258,7 @@ 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"); - as_xml (node); + as_xml (node, true); /* notes is unused here (we assume) */ list notes; @@ -254,14 +283,12 @@ Content::length_after_trim () const string Content::identifier () const { - SafeStringStream s; - - s << Content::digest() - << "_" << position().get() - << "_" << trim_start().get() - << "_" << trim_end().get(); - - return s.str (); + char buffer[256]; + snprintf ( + buffer, sizeof(buffer), "%s_%" PRId64 "_%" PRId64 "_%" PRId64, + Content::digest().c_str(), position().get(), trim_start().get(), trim_end().get() + ); + return buffer; } bool @@ -279,9 +306,16 @@ Content::paths_valid () const void Content::set_path (boost::filesystem::path path) { + ContentChange cc (this, ContentProperty::PATH); _paths.clear (); _paths.push_back (path); - signal_changed (ContentProperty::PATH); +} + +void +Content::set_paths (vector paths) +{ + ContentChange cc (this, ContentProperty::PATH); + _paths = paths; } string @@ -321,20 +355,39 @@ list Content::reel_split_points () const { list t; - /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */ - t.push_back (position().round_up (film()->video_frame_rate())); + /* This is only called for video content and such content has its position forced + to start on a frame boundary. + */ + t.push_back (position()); return t; } void Content::set_video_frame_rate (double r) { + ContentChange cc (this, ContentProperty::VIDEO_FRAME_RATE); + { boost::mutex::scoped_lock lm (_mutex); _video_frame_rate = r; } - signal_changed (ContentProperty::VIDEO_FRAME_RATE); + /* Make sure things are still on frame boundaries */ + if (video) { + set_position (position()); + set_trim_start (trim_start()); + } +} + +void +Content::unset_video_frame_rate () +{ + ContentChange cc (this, ContentProperty::VIDEO_FRAME_RATE); + + { + boost::mutex::scoped_lock lm (_mutex); + _video_frame_rate = optional(); + } } double @@ -362,10 +415,66 @@ Content::add_properties (list& p) const p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ())); if (_video_frame_rate) { - p.push_back ( - UserProperty ( - UserProperty::GENERAL, _("Video frame rate"), raw_convert (_video_frame_rate.get(), 5), _("frames per second") - ) - ); + if (video) { + p.push_back ( + UserProperty ( + UserProperty::VIDEO, + _("Frame rate"), + locale_convert (_video_frame_rate.get(), 5), + _("frames per second") + ) + ); + } else { + p.push_back ( + UserProperty ( + UserProperty::GENERAL, + _("Prepared for video frame rate"), + locale_convert (_video_frame_rate.get(), 5), + _("frames per second") + ) + ); + } + } +} + +/** Take settings from the given content if it is of the correct type */ +void +Content::take_settings_from (shared_ptr c) +{ + if (video && c->video) { + video->take_settings_from (c->video); + } + if (audio && c->audio) { + audio->take_settings_from (c->audio); + } + + list >::iterator i = text.begin (); + list >::const_iterator j = c->text.begin (); + while (i != text.end() && j != c->text.end()) { + (*i)->take_settings_from (*j); + ++i; + ++j; + } +} + +shared_ptr +Content::only_text () const +{ + DCPOMATIC_ASSERT (text.size() < 2); + if (text.empty ()) { + return shared_ptr (); } + return text.front (); +} + +shared_ptr +Content::text_of_original_type (TextType type) const +{ + BOOST_FOREACH (shared_ptr i, text) { + if (i->original_type() == type) { + return i; + } + } + + return shared_ptr (); }