X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Foverlaps.cc;h=32801de39e5c0449a6b85fbb1de02b7c1a1c831b;hb=b539d468acc3ca73cc58a4434002e511a4995f7d;hp=54077d96b0c5777bf63fafd7d4ece2e3c7275749;hpb=cbd4450197a083bf58bda510e626f73ba583cb66;p=dcpomatic.git diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc index 54077d96b..32801de39 100644 --- a/src/lib/overlaps.cc +++ b/src/lib/overlaps.cc @@ -21,17 +21,17 @@ #include "overlaps.h" #include "types.h" #include "content.h" -#include -using boost::shared_ptr; +using std::shared_ptr; using boost::function; +using namespace dcpomatic; -ContentList overlaps (ContentList cl, function)> part, DCPTime from, DCPTime to) +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()).overlap(period)) { + for (auto i: cl) { + if (part(i) && DCPTimePeriod(i->position(), i->end(film)).overlap(period)) { overlaps.push_back (i); } }