X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fempty.cc;h=96d036463483e7954f619f3b20d7c4f2641a53d1;hb=99cb0937e54340fa20c594aaa501276b8321cbf0;hp=68a153b0755d39a4869781847f12451fe042a4f8;hpb=7a3f4f1b6411f7d15bf00e863fb5e70a5d930dd8;p=dcpomatic.git

diff --git a/src/lib/empty.cc b/src/lib/empty.cc
index 68a153b07..96d036463 100644
--- a/src/lib/empty.cc
+++ b/src/lib/empty.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "empty.h"
 #include "film.h"
 #include "playlist.h"
@@ -25,43 +26,47 @@
 #include "content_part.h"
 #include "dcp_content.h"
 #include "dcpomatic_time_coalesce.h"
-#include <boost/foreach.hpp>
+#include "piece.h"
 #include <iostream>
 
+
 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 (ContentList content, DCPTime length, function<shared_ptr<ContentPart> (Content *)> 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<Content> i, content) {
-		if (part (i.get())) {
-			full.push_back (DCPTimePeriod (i->position(), i->end()));
+	for (auto i: playlist->content()) {
+		if (part(i) && i->paths_valid()) {
+			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;
@@ -69,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);
 		}
@@ -81,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);
 	}