Move digest calculation to a separate method.

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

diff --git a/src/lib/empty.cc b/src/lib/empty.cc
index 1e6e1c3fb51d21e76b1d7f2c8b058bb97040a2e1..0cf2b85dcb849c69550bfa953b613a96e170a684 100644 (file)
--- a/src/lib/empty.cc
+++ b/src/lib/empty.cc
@@ -26,21 +26,21 @@
 #include "dcp_content.h"
 #include "dcpomatic_time_coalesce.h"
 #include "piece.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::cout;
 using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::function;
+using namespace dcpomatic;
 
-Empty::Empty (list<shared_ptr<Piece> > pieces, DCPTime length, 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) {
+       for (auto i: playlist->content()) {
                if (part(i)) {
-                       full.push_back (DCPTimePeriod (i->content->position(), i->content->end()));
+                       full.push_back (DCPTimePeriod (i->position(), i->end(film)));
                }
        }
 
@@ -56,13 +56,13 @@ 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;
@@ -73,7 +73,7 @@ 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);
                }
@@ -86,7 +86,7 @@ bool
 Empty::done () const
 {
        DCPTime latest;
-       BOOST_FOREACH (DCPTimePeriod i, _periods) {
+       for (auto i: _periods) {
                latest = max (latest, i.to);
        }