Take Film pointer out of Content.

1 files changed, 11 insertions, 5 deletions

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 8281babc3..d3c5c57ed 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -40,7 +40,7 @@ struct dcp_subtitle_within_dcp_test;
 class DCPDecoder : public DCP, public Decoder
 {
 public:
-	DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log, bool fast);
+	DCPDecoder (boost::shared_ptr<const DCPContent>, bool fast);
 
 	std::list<boost::shared_ptr<dcp::Reel> > reels () const {
 		return _reels;
@@ -49,17 +49,23 @@ public:
 	void set_decode_referenced (bool r);
 	void set_forced_reduction (boost::optional<int> reduction);
 
-	bool pass ();
-	void seek (ContentTime t, bool accurate);
+	bool pass (boost::shared_ptr<const Film> film);
+	void seek (boost::shared_ptr<const Film> film, ContentTime t, bool accurate);
 
 private:
 	friend struct dcp_subtitle_within_dcp_test;
 
 	void next_reel ();
 	void get_readers ();
-	void pass_texts (ContentTime next, dcp::Size size);
+	void pass_texts (boost::shared_ptr<const Film> film, ContentTime next, dcp::Size size);
 	void pass_texts (
-		ContentTime next, boost::shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, boost::shared_ptr<TextDecoder> decoder, dcp::Size size
+		boost::shared_ptr<const Film> film,
+		ContentTime next,
+		boost::shared_ptr<dcp::SubtitleAsset> asset,
+		bool reference,
+		int64_t entry_point,
+		boost::shared_ptr<TextDecoder> decoder,
+		dcp::Size size
 		);
 
 	/** Time of next thing to return from pass relative to the start of _reel */