Remove Film dependency from Empty.

3 files changed, 6 insertions, 6 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;
diff --git a/src/lib/empty.h b/src/lib/empty.h
index ee1171428..d8b00047f 100644
--- a/src/lib/empty.h
+++ b/src/lib/empty.h
@@ -31,7 +31,7 @@ class Empty
 {
 public:
 	Empty () {}
-	Empty (boost::shared_ptr<const Film> film, boost::function<boost::shared_ptr<ContentPart> (Content *)> part);
+	Empty (ContentList content, DCPTime length, boost::function<boost::shared_ptr<ContentPart> (Content *)> part);
 
 	DCPTime position () const {
 		return _position;
diff --git a/src/lib/player.cc b/src/lib/player.cc
index db09d1768..3d191a302 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -156,8 +156,8 @@ Player::setup_pieces ()
 		}
 	}
 
-	_black = Empty (_film, bind(&Content::video, _1));
-	_silent = Empty (_film, bind(&Content::audio, _1));
+	_black = Empty (_film->content(), _film->length(), bind(&Content::video, _1));
+	_silent = Empty (_film->content(), _film->length(), bind(&Content::audio, _1));
 
 	_last_video_time = DCPTime ();
 	_last_audio_time = DCPTime ();