X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=7beb7f7b167be6bfa85bbae212a270787ee833aa;hb=refs%2Ftags%2Fv2.14.22;hp=6e1f95356a06f674a4562f3a385fd4d67f89b1f3;hpb=df28b0e939bd0f12ae31e6f7ba94fa954496b3b8;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 6e1f95356..7beb7f7b1 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -24,12 +24,13 @@
 
 #include "decoder.h"
 #include "dcp.h"
+#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;
-	class MonoPictureAssetReader;
-	class StereoPictureAssetReader;
-	class SoundAssetReader;
 }
 
 class DCPContent;
@@ -39,24 +40,34 @@ 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);
 
 	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);
+
+	ContentTime position () const;
 
 private:
 	friend struct dcp_subtitle_within_dcp_test;
 
-	bool pass (PassReason, bool accurate);
-	void seek (ContentTime t, bool accurate);
 	void next_reel ();
 	void get_readers ();
-
-	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+	void pass_texts (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
+		);
 
 	/** Time of next thing to return from pass relative to the start of _reel */
 	ContentTime _next;
@@ -73,4 +84,5 @@ private:
 	boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
 
 	bool _decode_referenced;
+	boost::optional<int> _forced_reduction;
 };