X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Foverlaps.cc;h=5ed7a983261fdb3a2b76924bf5cbd531d615f95a;hb=6b2c68525a3e8a6ea2152ba966f2ca1d861fed35;hp=9e1b2751763484adc3c3e32b866251b6c75d681e;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc index 9e1b27517..5ed7a9832 100644 --- a/src/lib/overlaps.cc +++ b/src/lib/overlaps.cc @@ -25,13 +25,14 @@ using boost::shared_ptr; using boost::function; +using namespace dcpomatic; -ContentList overlaps (ContentList cl, function (shared_ptr)> 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()).overlaps (period)) { + if (part(i) && DCPTimePeriod(i->position(), i->end(film)).overlap(period)) { overlaps.push_back (i); } }