X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Foverlaps.cc;h=7a541a7c292ec6b8c271b5f7604826de03b66365;hp=4c75ac0c3e4e567c6baf73ecf5a490d4ccba6075;hb=HEAD;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5 diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc index 4c75ac0c3..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,20 +18,22 @@ */ -#include "overlaps.h" -#include "types.h" + #include "content.h" -#include +#include "overlaps.h" + + +using std::function; +using std::shared_ptr; +using namespace dcpomatic; -using boost::shared_ptr; -using boost::function; 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); } }