X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Foverlaps.cc;h=536629b336804b0675fe37b0682f65d8da8dd9fc;hp=5ed7a983261fdb3a2b76924bf5cbd531d615f95a;hb=4e2ff7851127cd85c3e7d78b42eb884d0cda0ac3;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566 diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc index 5ed7a9832..536629b33 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 -using boost::shared_ptr; -using boost::function; + +using std::function; +using std::shared_ptr; 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) { + for (auto i: cl) { if (part(i) && DCPTimePeriod(i->position(), i->end(film)).overlap(period)) { overlaps.push_back (i); }