Nicer fix for 86102d30bf0aad89115bbeb3d8aaa2a27a0aa432

[dcpomatic.git] / src / lib / empty.cc

diff --git a/src/lib/empty.cc b/src/lib/empty.cc
index 206acfdb0a67d62131bb11c688906e68f01b49e2..c145c231bc02c1cef932282602aa7f8e0b27ce5b 100644 (file)
--- a/src/lib/empty.cc
+++ b/src/lib/empty.cc
@@ -36,16 +36,16 @@ using boost::dynamic_pointer_cast;
 using boost::function;
 using namespace dcpomatic;
 
-Empty::Empty (shared_ptr<const Film> film, list<shared_ptr<Piece> > pieces, function<bool (shared_ptr<Piece>)> part)
+Empty::Empty (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist, function<bool (shared_ptr<const Content>)> part, DCPTime length)
 {
        list<DCPTimePeriod> full;
-       BOOST_FOREACH (shared_ptr<Piece> i, pieces) {
+       BOOST_FOREACH (shared_ptr<Content> i, playlist->content()) {
                if (part(i)) {
-                       full.push_back (DCPTimePeriod (i->content->position(), i->content->end(film)));
+                       full.push_back (DCPTimePeriod (i->position(), i->end(film)));
                }
        }
 
-       _periods = subtract (DCPTimePeriod(DCPTime(), film->length()), coalesce(full));
+       _periods = subtract (DCPTimePeriod(DCPTime(), length), coalesce(full));
 
        if (!_periods.empty ()) {
                _position = _periods.front().from;