diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-08-02 16:00:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-08-14 21:07:48 +0100 |
| commit | 7a3f4f1b6411f7d15bf00e863fb5e70a5d930dd8 (patch) | |
| tree | d00041a7602ab4f21ce11377b4a1754cb6d43bd1 /src/lib/empty.cc | |
| parent | d66bcea066deb3b3cd919a69aab7e2078fb52ca8 (diff) | |
Remove Film dependency from Empty.
Diffstat (limited to 'src/lib/empty.cc')
| -rw-r--r-- | src/lib/empty.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/empty.cc b/src/lib/empty.cc index 98bf1f3d1..68a153b07 100644 --- a/src/lib/empty.cc +++ b/src/lib/empty.cc @@ -34,16 +34,16 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::function; -Empty::Empty (shared_ptr<const Film> film, function<shared_ptr<ContentPart> (Content *)> part) +Empty::Empty (ContentList content, DCPTime length, function<shared_ptr<ContentPart> (Content *)> part) { list<DCPTimePeriod> full; - BOOST_FOREACH (shared_ptr<Content> i, film->content()) { + BOOST_FOREACH (shared_ptr<Content> i, content) { if (part (i.get())) { full.push_back (DCPTimePeriod (i->position(), i->end())); } } - _periods = subtract (DCPTimePeriod(DCPTime(), film->length()), coalesce(full)); + _periods = subtract (DCPTimePeriod(DCPTime(), length), coalesce(full)); if (!_periods.empty ()) { _position = _periods.front().from; |
