X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=e4fc0f0723df7e100229dd1765d8ee831ba4c7da;hb=9d045fa4e19d6b9a3f2ffcd67a5b69de823595e6;hp=6abbbcab33810696dc2bbb551aa5cd512ed5ff98;hpb=e11276a822289d7d7d91a4f431f386ad28ef16dd;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 6abbbcab3..e4fc0f072 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -20,10 +20,11 @@ #include "playlist.h" #include "video_content.h" -#include "subtitle_content.h" +#include "text_content.h" #include "ffmpeg_decoder.h" #include "ffmpeg_content.h" #include "image_decoder.h" +#include "audio_content.h" #include "content_factory.h" #include "dcp_content.h" #include "job.h" @@ -64,31 +65,38 @@ Playlist::~Playlist () } void -Playlist::content_changed (weak_ptr content, int property, bool frequent) +Playlist::content_change (ChangeType type, weak_ptr content, int property, bool frequent) { - if (property == ContentProperty::LENGTH || property == VideoContentProperty::FRAME_TYPE) { - /* Don't respond to position changes here, as: - - sequencing after earlier/later changes is handled by move_earlier/move_later - - any other position changes will be timeline drags which should not result in content - being sequenced. - */ - maybe_sequence (); - } - - if ( - property == ContentProperty::POSITION || - property == ContentProperty::LENGTH || - property == ContentProperty::TRIM_START || - property == ContentProperty::TRIM_END) { - - ContentList old = _content; - sort (_content.begin(), _content.end(), ContentSorter ()); - if (_content != old) { - OrderChanged (); + if (type == CHANGE_TYPE_DONE) { + if ( + property == ContentProperty::TRIM_START || + property == ContentProperty::TRIM_END || + property == ContentProperty::LENGTH || + property == VideoContentProperty::FRAME_TYPE + ) { + /* Don't respond to position changes here, as: + - sequencing after earlier/later changes is handled by move_earlier/move_later + - any other position changes will be timeline drags which should not result in content + being sequenced. + */ + maybe_sequence (); + } + + if ( + property == ContentProperty::POSITION || + property == ContentProperty::LENGTH || + property == ContentProperty::TRIM_START || + property == ContentProperty::TRIM_END) { + + ContentList old = _content; + sort (_content.begin(), _content.end(), ContentSorter ()); + if (_content != old) { + OrderChanged (); + } } } - ContentChanged (content, property, frequent); + ContentChange (type, content, property, frequent); } void @@ -125,11 +133,11 @@ Playlist::maybe_sequence () placed.push_back (i); } - /* Subtitles */ + /* Captions */ DCPTime next; BOOST_FOREACH (shared_ptr i, _content) { - if (!i->subtitle || find (placed.begin(), placed.end(), i) != placed.end()) { + if (i->text.empty() || find (placed.begin(), placed.end(), i) != placed.end()) { continue; } @@ -149,7 +157,13 @@ Playlist::video_identifier () const string t; BOOST_FOREACH (shared_ptr i, _content) { - if (i->video || (i->subtitle && i->subtitle->burn())) { + bool burn = false; + BOOST_FOREACH (shared_ptr j, i->text) { + if (j->burn()) { + burn = true; + } + } + if (i->video || burn) { t += i->identifier (); } } @@ -159,7 +173,11 @@ Playlist::video_identifier () const return digester.get (); } -/** @param node node */ +/** @param film Film that this Playlist is for. + * @param node <Playlist> node. + * @param version Metadata version number. + * @param notes Output notes about that happened. + */ void Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, int version, list& notes) { @@ -173,7 +191,9 @@ Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, in reconnect (); } -/** @param node node */ +/** @param node <Playlist> node. + * @param with_content_paths true to include <Path> nodes in <Content> nodes, false to omit them. + */ void Playlist::as_xml (xmlpp::Node* node, bool with_content_paths) { @@ -185,15 +205,18 @@ Playlist::as_xml (xmlpp::Node* node, bool with_content_paths) void Playlist::add (shared_ptr c) { + Change (CHANGE_TYPE_PENDING); _content.push_back (c); sort (_content.begin(), _content.end(), ContentSorter ()); reconnect (); - Changed (); + Change (CHANGE_TYPE_DONE); } void Playlist::remove (shared_ptr c) { + Change (CHANGE_TYPE_PENDING); + ContentList::iterator i = _content.begin (); while (i != _content.end() && *i != c) { ++i; @@ -201,7 +224,9 @@ Playlist::remove (shared_ptr c) if (i != _content.end ()) { _content.erase (i); - Changed (); + Change (CHANGE_TYPE_DONE); + } else { + Change (CHANGE_TYPE_CANCELLED); } /* This won't change order, so it does not need a sort */ @@ -210,6 +235,8 @@ Playlist::remove (shared_ptr c) void Playlist::remove (ContentList c) { + Change (CHANGE_TYPE_PENDING); + BOOST_FOREACH (shared_ptr i, c) { ContentList::iterator j = _content.begin (); while (j != _content.end() && *j != i) { @@ -223,7 +250,7 @@ Playlist::remove (ContentList c) /* This won't change order, so it does not need a sort */ - Changed (); + Change (CHANGE_TYPE_DONE); } class FrameRateCandidate @@ -332,7 +359,7 @@ Playlist::reconnect () _content_connections.clear (); BOOST_FOREACH (shared_ptr i, _content) { - _content_connections.push_back (i->Changed.connect (bind (&Playlist::content_changed, this, _1, _2, _3))); + _content_connections.push_back (i->Change.connect(boost::bind(&Playlist::content_change, this, _1, _2, _3, _4))); } } @@ -350,11 +377,11 @@ Playlist::video_end () const } DCPTime -Playlist::subtitle_end () const +Playlist::text_end () const { DCPTime end; BOOST_FOREACH (shared_ptr i, _content) { - if (i->subtitle) { + if (!i->text.empty ()) { end = max (end, i->end ()); } } @@ -429,6 +456,8 @@ Playlist::repeat (ContentList c, int n) range.second = max (range.second, i->end ()); } + Change (CHANGE_TYPE_PENDING); + DCPTime pos = range.second; for (int i = 0; i < n; ++i) { BOOST_FOREACH (shared_ptr j, c) { @@ -442,7 +471,7 @@ Playlist::repeat (ContentList c, int n) sort (_content.begin(), _content.end(), ContentSorter ()); reconnect (); - Changed (); + Change (CHANGE_TYPE_DONE); } void @@ -537,14 +566,25 @@ Playlist::content_summary (DCPTimePeriod period) const return best_summary; } -bool -Playlist::video_content_at (DCPTime time) const +pair +Playlist::speed_up_range (int dcp_video_frame_rate) const { + pair range (DBL_MAX, -DBL_MAX); + BOOST_FOREACH (shared_ptr i, _content) { - if (i->video && i->position() <= time && time < i->end()) { - return true; + if (!i->video) { + continue; + } + if (i->video_frame_rate()) { + FrameRateChange const frc (i->video_frame_rate().get(), dcp_video_frame_rate); + range.first = min (range.first, frc.speed_up); + range.second = max (range.second, frc.speed_up); + } else { + FrameRateChange const frc (dcp_video_frame_rate, dcp_video_frame_rate); + range.first = min (range.first, frc.speed_up); + range.second = max (range.second, frc.speed_up); } } - return false; + return range; }