diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
| commit | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch) | |
| tree | 8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/lib/overlaps.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'src/lib/overlaps.cc')
| -rw-r--r-- | src/lib/overlaps.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc index 54077d96b..4c75ac0c3 100644 --- a/src/lib/overlaps.cc +++ b/src/lib/overlaps.cc @@ -26,12 +26,12 @@ using boost::shared_ptr; using boost::function; -ContentList overlaps (ContentList cl, function<bool (shared_ptr<const Content>)> part, DCPTime from, DCPTime to) +ContentList overlaps (shared_ptr<const Film> film, ContentList cl, function<bool (shared_ptr<const Content>)> part, DCPTime from, DCPTime to) { ContentList overlaps; DCPTimePeriod period (from, to); BOOST_FOREACH (shared_ptr<Content> i, cl) { - if (part(i) && DCPTimePeriod(i->position(), i->end()).overlap(period)) { + if (part(i) && DCPTimePeriod(i->position(), i->end(film)).overlap(period)) { overlaps.push_back (i); } } |