summaryrefslogtreecommitdiff
path: root/src/lib/empty.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-21 01:59:04 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-21 01:59:04 +0000
commit254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch)
tree8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/lib/empty.cc
parentc31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff)
Take Film pointer out of Content.
Diffstat (limited to 'src/lib/empty.cc')
-rw-r--r--src/lib/empty.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/empty.cc b/src/lib/empty.cc
index 1e6e1c3fb..1df318b25 100644
--- a/src/lib/empty.cc
+++ b/src/lib/empty.cc
@@ -35,16 +35,16 @@ using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::function;
-Empty::Empty (list<shared_ptr<Piece> > pieces, DCPTime length, function<bool (shared_ptr<Piece>)> part)
+Empty::Empty (shared_ptr<const Film> film, list<shared_ptr<Piece> > pieces, function<bool (shared_ptr<Piece>)> part)
{
list<DCPTimePeriod> full;
BOOST_FOREACH (shared_ptr<Piece> i, pieces) {
if (part(i)) {
- full.push_back (DCPTimePeriod (i->content->position(), i->content->end()));
+ full.push_back (DCPTimePeriod (i->content->position(), i->content->end(film)));
}
}
- _periods = subtract (DCPTimePeriod(DCPTime(), length), coalesce(full));
+ _periods = subtract (DCPTimePeriod(DCPTime(), film->length()), coalesce(full));
if (!_periods.empty ()) {
_position = _periods.front().from;