Supporters update.

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

diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc
index 32801de39e5c0449a6b85fbb1de02b7c1a1c831b..fbc6b5cb1813c7646950f554c25cc952f8e6a5d0 100644 (file)
--- a/src/lib/overlaps.cc
+++ b/src/lib/overlaps.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,22 @@
 
 */
 
-#include "overlaps.h"
-#include "types.h"
+
 #include "content.h"
+#include "overlaps.h"
 
+
+using std::function;
 using std::shared_ptr;
-using boost::function;
 using namespace dcpomatic;
 
+
 ContentList overlaps (shared_ptr<const Film> film, ContentList cl, function<bool (shared_ptr<const Content>)> part, DCPTime from, DCPTime to)
 {
        ContentList overlaps;
        DCPTimePeriod period (from, to);
        for (auto i: cl) {
-               if (part(i) && DCPTimePeriod(i->position(), i->end(film)).overlap(period)) {
+               if (part(i) && i->period(film).overlap(period)) {
                        overlaps.push_back (i);
                }
        }