C++11 tidying.

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

diff --git a/src/lib/empty.cc b/src/lib/empty.cc
index 98bf1f3d186e2619d864706e82dbebde22b2b108..f6dcad96fb730162e6824ba273d84ffa31199e5f 100644 (file)
--- 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 (shared_ptr<const Film> film, 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, film->content()) {
-               if (part (i.get())) {
-                       full.push_back (DCPTimePeriod (i->position(), i->end()));
+       for (auto i: playlist->content()) {
+               if (part(i)) {
+                       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 ()) {
+       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);
        }