X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fempty.cc;h=f6dcad96fb730162e6824ba273d84ffa31199e5f;hb=2e2f11b29651cffe37c64275dbd45c7563310020;hp=c145c231bc02c1cef932282602aa7f8e0b27ce5b;hpb=4219d4b76c5cd5690b1f4fa0c248d93ced26d05a;p=dcpomatic.git diff --git a/src/lib/empty.cc b/src/lib/empty.cc index c145c231b..f6dcad96f 100644 --- a/src/lib/empty.cc +++ b/src/lib/empty.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Carl Hetherington + Copyright (C) 2017-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "empty.h" #include "film.h" #include "playlist.h" @@ -26,44 +27,46 @@ #include "dcp_content.h" #include "dcpomatic_time_coalesce.h" #include "piece.h" -#include #include + using std::cout; using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; -using boost::function; +using std::shared_ptr; +using std::dynamic_pointer_cast; +using std::function; using namespace dcpomatic; + Empty::Empty (shared_ptr film, shared_ptr playlist, function)> part, DCPTime length) { list full; - BOOST_FOREACH (shared_ptr i, playlist->content()) { + for (auto i: playlist->content()) { if (part(i)) { - full.push_back (DCPTimePeriod (i->position(), i->end(film))); + full.push_back (DCPTimePeriod(i->position(), i->end(film))); } } _periods = subtract (DCPTimePeriod(DCPTime(), length), coalesce(full)); - if (!_periods.empty ()) { + if (!_periods.empty()) { _position = _periods.front().from; } } + void Empty::set_position (DCPTime position) { _position = position; - BOOST_FOREACH (DCPTimePeriod i, _periods) { + for (auto i: _periods) { if (i.contains(_position)) { return; } } - BOOST_FOREACH (DCPTimePeriod i, _periods) { + for (auto i: _periods) { if (i.from > _position) { _position = i.from; return; @@ -71,10 +74,11 @@ Empty::set_position (DCPTime position) } } + DCPTimePeriod Empty::period_at_position () const { - BOOST_FOREACH (DCPTimePeriod i, _periods) { + for (auto i: _periods) { if (i.contains(_position)) { return DCPTimePeriod (_position, i.to); } @@ -83,11 +87,12 @@ Empty::period_at_position () const DCPOMATIC_ASSERT (false); } + bool Empty::done () const { DCPTime latest; - BOOST_FOREACH (DCPTimePeriod i, _periods) { + for (auto i: _periods) { latest = max (latest, i.to); }