X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=9e96c693a529679b197ae66e0ba6c67d8a2fc248;hp=a6b633f2cfaaac64d06eba62730759574ac65ac7;hb=ce17803bf356f3e796dccde43b4cc3656609e7fc;hpb=078a0f98e3f741210be7f839292f41f28b6a403e diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index a6b633f2c..9e96c693a 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -51,6 +51,7 @@ using boost::optional; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +using namespace dcpomatic; Playlist::Playlist () : _sequence (true) @@ -61,6 +62,7 @@ Playlist::Playlist () Playlist::~Playlist () { + boost::mutex::scoped_lock lm (_mutex); _content.clear (); disconnect (); } @@ -99,9 +101,16 @@ Playlist::content_change (weak_ptr weak_film, ChangeType type, weak_ property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END) { - ContentList old = _content; - sort (_content.begin(), _content.end(), ContentSorter ()); - if (_content != old) { + bool changed = false; + + { + boost::mutex::scoped_lock lm (_mutex); + ContentList old = _content; + sort (_content.begin(), _content.end(), ContentSorter ()); + changed = _content != old; + } + + if (changed) { OrderChanged (); } } @@ -119,6 +128,8 @@ Playlist::maybe_sequence (shared_ptr film) _sequencing = true; + ContentList cont = content (); + /* Keep track of the content that we've set the position of so that we don't do it twice. */ @@ -128,7 +139,7 @@ Playlist::maybe_sequence (shared_ptr film) DCPTime next_left; DCPTime next_right; - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, cont) { if (!i->video) { continue; } @@ -147,7 +158,7 @@ Playlist::maybe_sequence (shared_ptr film) /* Captions */ DCPTime next; - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, cont) { if (i->text.empty() || find (placed.begin(), placed.end(), i) != placed.end()) { continue; } @@ -167,7 +178,7 @@ Playlist::video_identifier () const { string t; - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, content()) { bool burn = false; BOOST_FOREACH (shared_ptr j, i->text) { if (j->burn()) { @@ -192,6 +203,8 @@ Playlist::video_identifier () const void Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, int version, list& notes) { + boost::mutex::scoped_lock lm (_mutex); + BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Content")) { shared_ptr content = content_factory (i, version, notes); @@ -250,7 +263,7 @@ Playlist::set_from_xml (shared_ptr film, cxml::ConstNodePtr node, in void Playlist::as_xml (xmlpp::Node* node, bool with_content_paths) { - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, content()) { i->as_xml (node->add_child ("Content"), with_content_paths); } } @@ -259,9 +272,14 @@ void Playlist::add (shared_ptr film, shared_ptr c) { Change (CHANGE_TYPE_PENDING); - _content.push_back (c); - sort (_content.begin(), _content.end(), ContentSorter ()); - reconnect (film); + + { + boost::mutex::scoped_lock lm (_mutex); + _content.push_back (c); + sort (_content.begin(), _content.end(), ContentSorter ()); + reconnect (film); + } + Change (CHANGE_TYPE_DONE); } @@ -270,16 +288,27 @@ Playlist::remove (shared_ptr c) { Change (CHANGE_TYPE_PENDING); - ContentList::iterator i = _content.begin (); - while (i != _content.end() && *i != c) { - ++i; + bool cancelled = false; + + { + boost::mutex::scoped_lock lm (_mutex); + + ContentList::iterator i = _content.begin (); + while (i != _content.end() && *i != c) { + ++i; + } + + if (i != _content.end()) { + _content.erase (i); + } else { + cancelled = true; + } } - if (i != _content.end ()) { - _content.erase (i); - Change (CHANGE_TYPE_DONE); - } else { + if (cancelled) { Change (CHANGE_TYPE_CANCELLED); + } else { + Change (CHANGE_TYPE_DONE); } /* This won't change order, so it does not need a sort */ @@ -290,14 +319,18 @@ 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) { - ++j; - } + { + boost::mutex::scoped_lock lm (_mutex); - if (j != _content.end ()) { - _content.erase (j); + BOOST_FOREACH (shared_ptr i, c) { + ContentList::iterator j = _content.begin (); + while (j != _content.end() && *j != i) { + ++j; + } + + if (j != _content.end ()) { + _content.erase (j); + } } } @@ -345,7 +378,7 @@ Playlist::best_video_frame_rate () const while (i != candidates.end()) { float this_error = 0; - BOOST_FOREACH (shared_ptr j, _content) { + BOOST_FOREACH (shared_ptr j, content()) { if (!j->video || !j->video_frame_rate()) { continue; } @@ -380,7 +413,7 @@ DCPTime Playlist::length (shared_ptr film) const { DCPTime len; - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, content()) { len = max (len, i->end(film)); } @@ -391,28 +424,31 @@ Playlist::length (shared_ptr film) const optional Playlist::start () const { - if (_content.empty ()) { + ContentList cont = content (); + if (cont.empty()) { return optional (); } DCPTime start = DCPTime::max (); - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, cont) { start = min (start, i->position ()); } return start; } +/** Must be called with a lock held on _mutex */ void Playlist::disconnect () { - for (list::iterator i = _content_connections.begin(); i != _content_connections.end(); ++i) { - i->disconnect (); + BOOST_FOREACH (boost::signals2::connection& i, _content_connections) { + i.disconnect (); } _content_connections.clear (); } +/** Must be called with a lock held on _mutex */ void Playlist::reconnect (shared_ptr film) { @@ -427,7 +463,7 @@ DCPTime Playlist::video_end (shared_ptr film) const { DCPTime end; - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, content()) { if (i->video) { end = max (end, i->end(film)); } @@ -440,7 +476,7 @@ DCPTime Playlist::text_end (shared_ptr film) const { DCPTime end; - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, content()) { if (!i->text.empty ()) { end = max (end, i->end(film)); } @@ -452,7 +488,8 @@ Playlist::text_end (shared_ptr film) const FrameRateChange Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const { - for (ContentList::const_reverse_iterator i = _content.rbegin(); i != _content.rend(); ++i) { + ContentList cont = content (); + for (ContentList::const_reverse_iterator i = cont.rbegin(); i != cont.rend(); ++i) { if (!(*i)->video) { continue; } @@ -502,6 +539,7 @@ ContentSorter::operator() (shared_ptr a, shared_ptr b) ContentList Playlist::content () const { + boost::mutex::scoped_lock lm (_mutex); return _content; } @@ -518,34 +556,39 @@ Playlist::repeat (shared_ptr film, ContentList c, int n) 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 (film, pos + copy->position() - range.first); - _content.push_back (copy); + { + boost::mutex::scoped_lock lm (_mutex); + + 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 (film, pos + copy->position() - range.first); + _content.push_back (copy); + } + pos += range.second - range.first; } - pos += range.second - range.first; - } - sort (_content.begin(), _content.end(), ContentSorter ()); + sort (_content.begin(), _content.end(), ContentSorter ()); + reconnect (film); + } - reconnect (film); Change (CHANGE_TYPE_DONE); } void Playlist::move_earlier (shared_ptr film, shared_ptr c) { - ContentList::iterator previous = _content.end (); - ContentList::iterator i = _content.begin(); - while (i != _content.end() && *i != c) { + ContentList cont = content (); + ContentList::iterator previous = cont.end(); + ContentList::iterator i = cont.begin(); + while (i != cont.end() && *i != c) { previous = i; ++i; } - DCPOMATIC_ASSERT (i != _content.end ()); - if (previous == _content.end ()) { + DCPOMATIC_ASSERT (i != cont.end()); + if (previous == cont.end()) { return; } @@ -559,17 +602,18 @@ Playlist::move_earlier (shared_ptr film, shared_ptr c) void Playlist::move_later (shared_ptr film, shared_ptr c) { - ContentList::iterator i = _content.begin(); - while (i != _content.end() && *i != c) { + ContentList cont = content (); + ContentList::iterator i = cont.begin(); + while (i != cont.end() && *i != c) { ++i; } - DCPOMATIC_ASSERT (i != _content.end ()); + DCPOMATIC_ASSERT (i != cont.end()); ContentList::iterator next = i; ++next; - if (next == _content.end ()) { + if (next == cont.end()) { return; } @@ -585,7 +629,7 @@ Playlist::required_disk_space (shared_ptr film, int j2k_bandwidth, i 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) { + BOOST_FOREACH (shared_ptr i, content()) { shared_ptr d = dynamic_pointer_cast (i); if (d) { if (d->reference_video()) { @@ -606,7 +650,7 @@ Playlist::content_summary (shared_ptr film, DCPTimePeriod period) co { string best_summary; int best_score = -1; - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, content()) { int score = 0; optional const o = DCPTimePeriod(i->position(), i->end(film)).overlap (period); if (o) { @@ -631,7 +675,7 @@ Playlist::speed_up_range (int dcp_video_frame_rate) const { pair range (DBL_MAX, -DBL_MAX); - BOOST_FOREACH (shared_ptr i, _content) { + BOOST_FOREACH (shared_ptr i, content()) { if (!i->video) { continue; }