X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplaylist.cc;h=c10235f9beb4e91a03d7cfc7adca9d4025dddf78;hb=46d58f0a7898acabf77c3306e2066903d2444a73;hp=1bb0ad0d6cda449354ed0eae1da435d59e649131;hpb=1fe6bd7f8ba059322b8357b2210f0fd590567ce2;p=dcpomatic.git diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 1bb0ad0d6..c10235f9b 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -31,6 +31,7 @@ #include "config.h" #include "util.h" #include "digester.h" +#include "compose.hpp" #include #include #include @@ -61,56 +62,49 @@ Playlist::Playlist () Playlist::~Playlist () { _content.clear (); - reconnect (); + disconnect (); } void -Playlist::content_may_change () +Playlist::content_change (weak_ptr weak_film, ChangeType type, weak_ptr content, int property, bool frequent) { - ContentMayChange (); -} + shared_ptr film = weak_film.lock (); + DCPOMATIC_ASSERT (film); + + 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 (film); + } -void -Playlist::content_not_changed () -{ - ContentNotChanged (); -} + if ( + property == ContentProperty::POSITION || + property == ContentProperty::LENGTH || + property == ContentProperty::TRIM_START || + property == ContentProperty::TRIM_END) { -void -Playlist::content_changed (weak_ptr content, int property, bool frequent) -{ - 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 (); + ContentList old = _content; + sort (_content.begin(), _content.end(), ContentSorter ()); + if (_content != old) { + OrderChanged (); + } } } - ContentChanged (content, property, frequent); + ContentChange (type, content, property, frequent); } void -Playlist::maybe_sequence () +Playlist::maybe_sequence (shared_ptr film) { if (!_sequence || _sequencing) { return; @@ -133,11 +127,11 @@ Playlist::maybe_sequence () } if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { - i->set_position (next_right); - next_right = i->end(); + i->set_position (film, next_right); + next_right = i->end(film); } else { - i->set_position (next_left); - next_left = i->end(); + i->set_position (film, next_left); + next_left = i->end(film); } placed.push_back (i); @@ -151,8 +145,8 @@ Playlist::maybe_sequence () continue; } - i->set_position (next); - next = i->end(); + i->set_position (film, next); + next = i->end(film); } @@ -192,13 +186,55 @@ void Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, int version, list& notes) { BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Content")) { - _content.push_back (content_factory (film, i, version, notes)); + shared_ptr content = content_factory (i, version, notes); + + /* See if this content should be nudged to start on a video frame */ + DCPTime const old_pos = content->position(); + content->set_position(film, old_pos); + if (old_pos != content->position()) { + string note = _("Your project contains video content that was not aligned to a frame boundary."); + note += " "; + if (old_pos < content->position()) { + note += String::compose( + _("The file %1 has been moved %2 milliseconds later."), + content->path_summary(), DCPTime(content->position() - old_pos).seconds() * 1000 + ); + } else { + note += String::compose( + _("The file %1 has been moved %2 milliseconds earlier."), + content->path_summary(), DCPTime(content->position() - old_pos).seconds() * 1000 + ); + } + notes.push_back (note); + } + + /* ...or have a start trim which is an integer number of frames */ + ContentTime const old_trim = content->trim_start(); + content->set_trim_start(old_trim); + if (old_trim != content->trim_start()) { + string note = _("Your project contains video content whose trim was not aligned to a frame boundary."); + note += " "; + if (old_trim < content->trim_start()) { + note += String::compose( + _("The file %1 has been trimmed by %2 milliseconds more."), + content->path_summary(), ContentTime(content->trim_start() - old_trim).seconds() * 1000 + ); + } else { + note += String::compose( + _("The file %1 has been trimmed by %2 milliseconds less."), + content->path_summary(), ContentTime(old_trim - content->trim_start()).seconds() * 1000 + ); + } + notes.push_back (note); + } + + _content.push_back (content); } /* This shouldn't be necessary but better safe than sorry (there could be old files) */ sort (_content.begin(), _content.end(), ContentSorter ()); - reconnect (); + reconnect (film); } /** @param node <Playlist> node. @@ -213,17 +249,20 @@ Playlist::as_xml (xmlpp::Node* node, bool with_content_paths) } void -Playlist::add (shared_ptr c) +Playlist::add (shared_ptr film, shared_ptr c) { + Change (CHANGE_TYPE_PENDING); _content.push_back (c); sort (_content.begin(), _content.end(), ContentSorter ()); - reconnect (); - Changed (); + reconnect (film); + 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; @@ -231,7 +270,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 */ @@ -240,6 +281,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) { @@ -253,7 +296,7 @@ Playlist::remove (ContentList c) /* This won't change order, so it does not need a sort */ - Changed (); + Change (CHANGE_TYPE_DONE); } class FrameRateCandidate @@ -326,11 +369,11 @@ Playlist::best_video_frame_rate () const /** @return length of the playlist from time 0 to the last thing on the playlist */ DCPTime -Playlist::length () const +Playlist::length (shared_ptr film) const { DCPTime len; BOOST_FOREACH (shared_ptr i, _content) { - len = max (len, i->end()); + len = max (len, i->end(film)); } return len; @@ -353,28 +396,32 @@ Playlist::start () const } void -Playlist::reconnect () +Playlist::disconnect () { for (list::iterator i = _content_connections.begin(); i != _content_connections.end(); ++i) { i->disconnect (); } _content_connections.clear (); +} + +void +Playlist::reconnect (shared_ptr film) +{ + disconnect (); BOOST_FOREACH (shared_ptr i, _content) { - _content_connections.push_back (i->MayChange.connect(boost::bind(&Playlist::content_may_change, this))); - _content_connections.push_back (i->Changed.connect(boost::bind(&Playlist::content_changed, this, _1, _2, _3))); - _content_connections.push_back (i->NotChanged.connect(boost::bind(&Playlist::content_not_changed, this))); + _content_connections.push_back (i->Change.connect(boost::bind(&Playlist::content_change, this, film, _1, _2, _3, _4))); } } DCPTime -Playlist::video_end () const +Playlist::video_end (shared_ptr film) const { DCPTime end; BOOST_FOREACH (shared_ptr i, _content) { if (i->video) { - end = max (end, i->end ()); + end = max (end, i->end(film)); } } @@ -382,12 +429,12 @@ Playlist::video_end () const } DCPTime -Playlist::text_end () const +Playlist::text_end (shared_ptr film) const { DCPTime end; BOOST_FOREACH (shared_ptr i, _content) { if (!i->text.empty ()) { - end = max (end, i->end ()); + end = max (end, i->end(film)); } } @@ -451,21 +498,23 @@ Playlist::content () const } void -Playlist::repeat (ContentList c, int n) +Playlist::repeat (shared_ptr film, ContentList c, int n) { pair range (DCPTime::max (), DCPTime ()); BOOST_FOREACH (shared_ptr i, c) { range.first = min (range.first, i->position ()); range.second = max (range.second, i->position ()); - range.first = min (range.first, i->end ()); - range.second = max (range.second, i->end ()); + range.first = min (range.first, i->end(film)); + range.second = max (range.second, i->end(film)); } + Change (CHANGE_TYPE_PENDING); + DCPTime pos = range.second; for (int i = 0; i < n; ++i) { BOOST_FOREACH (shared_ptr j, c) { shared_ptr copy = j->clone (); - copy->set_position (pos + copy->position() - range.first); + copy->set_position (film, pos + copy->position() - range.first); _content.push_back (copy); } pos += range.second - range.first; @@ -473,12 +522,12 @@ Playlist::repeat (ContentList c, int n) sort (_content.begin(), _content.end(), ContentSorter ()); - reconnect (); - Changed (); + reconnect (film); + Change (CHANGE_TYPE_DONE); } void -Playlist::move_earlier (shared_ptr c) +Playlist::move_earlier (shared_ptr film, shared_ptr c) { ContentList::iterator previous = _content.end (); ContentList::iterator i = _content.begin(); @@ -495,12 +544,12 @@ Playlist::move_earlier (shared_ptr c) shared_ptr previous_c = *previous; DCPTime const p = previous_c->position (); - previous_c->set_position (p + c->length_after_trim ()); - c->set_position (p); + previous_c->set_position (film, p + c->length_after_trim(film)); + c->set_position (film, p); } void -Playlist::move_later (shared_ptr c) +Playlist::move_later (shared_ptr film, shared_ptr c) { ContentList::iterator i = _content.begin(); while (i != _content.end() && *i != c) { @@ -518,24 +567,24 @@ Playlist::move_later (shared_ptr c) shared_ptr next_c = *next; - next_c->set_position (c->position ()); - c->set_position (c->position() + next_c->length_after_trim ()); + next_c->set_position (film, c->position()); + c->set_position (film, c->position() + next_c->length_after_trim(film)); } int64_t -Playlist::required_disk_space (int j2k_bandwidth, int audio_channels, int audio_frame_rate) const +Playlist::required_disk_space (shared_ptr film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const { - int64_t video = uint64_t (j2k_bandwidth / 8) * length().seconds (); - int64_t audio = uint64_t (audio_channels * audio_frame_rate * 3) * length().seconds (); + int64_t video = uint64_t (j2k_bandwidth / 8) * length(film).seconds(); + int64_t audio = uint64_t (audio_channels * audio_frame_rate * 3) * length(film).seconds(); BOOST_FOREACH (shared_ptr i, _content) { shared_ptr d = dynamic_pointer_cast (i); if (d) { if (d->reference_video()) { - video -= uint64_t (j2k_bandwidth / 8) * d->length_after_trim().seconds(); + video -= uint64_t (j2k_bandwidth / 8) * d->length_after_trim(film).seconds(); } if (d->reference_audio()) { - audio -= uint64_t (audio_channels * audio_frame_rate * 3) * d->length_after_trim().seconds(); + audio -= uint64_t (audio_channels * audio_frame_rate * 3) * d->length_after_trim(film).seconds(); } } } @@ -545,13 +594,13 @@ Playlist::required_disk_space (int j2k_bandwidth, int audio_channels, int audio_ } string -Playlist::content_summary (DCPTimePeriod period) const +Playlist::content_summary (shared_ptr film, DCPTimePeriod period) const { string best_summary; int best_score = -1; BOOST_FOREACH (shared_ptr i, _content) { int score = 0; - optional const o = DCPTimePeriod(i->position(), i->end()).overlap (period); + optional const o = DCPTimePeriod(i->position(), i->end(film)).overlap (period); if (o) { score += 100 * o.get().duration().get() / period.duration().get(); }