X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=2e63b24a296ca488079150378a8942982cada924;hb=89ec77ff82b231445f2c5a4cf50d86e6cd910332;hp=71687ad15df1e3eabe711466f7d27cc21f78e776;hpb=eb135e8dcdf36ae82420bcd18e954ad593b3e9a5;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 71687ad15..2e63b24a2 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -27,6 +27,7 @@
 #include <dcp/mono_picture_asset_reader.h>
 #include <dcp/stereo_picture_asset_reader.h>
 #include <dcp/sound_asset_reader.h>
+#include <dcp/subtitle_asset.h>
 
 namespace dcp {
 	class Reel;
@@ -39,25 +40,41 @@ struct dcp_subtitle_within_dcp_test;
 class DCPDecoder : public DCP, public Decoder
 {
 public:
-	DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log);
+	DCPDecoder (
+		boost::shared_ptr<const Film> film,
+		boost::shared_ptr<const DCPContent>,
+		bool fast,
+		bool tolerant,
+		boost::shared_ptr<DCPDecoder> old
+		);
 
 	std::list<boost::shared_ptr<dcp::Reel> > reels () const {
 		return _reels;
 	}
 
-	void set_decode_referenced ();
+	void set_decode_referenced (bool r);
+	void set_forced_reduction (boost::optional<int> reduction);
 
 	bool pass ();
-	void seek (ContentTime t, bool accurate);
+	void seek (dcpomatic::ContentTime t, bool accurate);
 
 private:
 	friend struct dcp_subtitle_within_dcp_test;
 
 	void next_reel ();
 	void get_readers ();
+	void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
+	void pass_texts (
+		dcpomatic::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 */
-	ContentTime _next;
+	dcpomatic::ContentTime _next;
 	std::list<boost::shared_ptr<dcp::Reel> > _reels;
 
 	std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
@@ -71,4 +88,5 @@ private:
 	boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
 
 	bool _decode_referenced;
+	boost::optional<int> _forced_reduction;
 };