X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Foverlaps.cc;h=fbc6b5cb1813c7646950f554c25cc952f8e6a5d0;hb=67cc6717aeb5f3b96448b206d1b85d68cbb26767;hp=f5ccd48d0276db1153e1129f7e2ca1633bd2bbd9;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc index f5ccd48d0..fbc6b5cb1 100644 --- a/src/lib/overlaps.cc +++ b/src/lib/overlaps.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,21 +18,22 @@ */ -#include "overlaps.h" -#include "types.h" + #include "content.h" -#include +#include "overlaps.h" + +using std::function; using std::shared_ptr; -using boost::function; using namespace dcpomatic; + ContentList overlaps (shared_ptr film, ContentList cl, function)> part, DCPTime from, DCPTime to) { ContentList overlaps; DCPTimePeriod period (from, to); - BOOST_FOREACH (shared_ptr i, cl) { - if (part(i) && DCPTimePeriod(i->position(), i->end(film)).overlap(period)) { + for (auto i: cl) { + if (part(i) && i->period(film).overlap(period)) { overlaps.push_back (i); } }