s/destroy_thread/stop_thread/

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

diff --git a/src/lib/empty.cc b/src/lib/empty.cc
index 68a153b0755d39a4869781847f12451fe042a4f8..1df318b25275a2a634fe45ef21017e28889859cf 100644 (file)
--- a/src/lib/empty.cc
+++ b/src/lib/empty.cc
@@ -25,6 +25,7 @@
 #include "content_part.h"
 #include "dcp_content.h"
 #include "dcpomatic_time_coalesce.h"
+#include "piece.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -34,16 +35,16 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::function;
 
-Empty::Empty (ContentList content, DCPTime length, function<shared_ptr<ContentPart> (Content *)> part)
+Empty::Empty (shared_ptr<const Film> film, list<shared_ptr<Piece> > pieces, function<bool (shared_ptr<Piece>)> part)
 {
        list<DCPTimePeriod> full;
-       BOOST_FOREACH (shared_ptr<Content> i, content) {
-               if (part (i.get())) {
-                       full.push_back (DCPTimePeriod (i->position(), i->end()));
+       BOOST_FOREACH (shared_ptr<Piece> i, pieces) {
+               if (part(i)) {
+                       full.push_back (DCPTimePeriod (i->content->position(), i->content->end(film)));
                }
        }
 
-       _periods = subtract (DCPTimePeriod(DCPTime(), length), coalesce(full));
+       _periods = subtract (DCPTimePeriod(DCPTime(), film->length()), coalesce(full));
 
        if (!_periods.empty ()) {
                _position = _periods.front().from;