X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=483c057acf76121a849e2506ec2279a49da77142;hb=86ef75d2d857309257086b94434564997976c912;hp=7ad6fcbf7c53eff44193f4c5c289e424fd94c2b3;hpb=368832f2ff6837d9029020b41fb97fb148c3be31;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 7ad6fcbf7..483c057ac 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -23,19 +23,20 @@
  */
 
 #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>
 
 namespace dcp {
 	class Reel;
-	class MonoPictureAssetReader;
-	class StereoPictureAssetReader;
-	class SoundAssetReader;
 }
 
 class DCPContent;
 class Log;
 struct dcp_subtitle_within_dcp_test;
 
-class DCPDecoder : public Decoder
+class DCPDecoder : public DCP, public Decoder
 {
 public:
 	DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log, bool fast);
@@ -44,18 +45,19 @@ public:
 		return _reels;
 	}
 
+	void set_decode_referenced (bool r);
+	void set_forced_reduction (boost::optional<int> reduction);
+
+	bool pass ();
+	void seek (ContentTime t, bool accurate);
+
 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 ();
+	void pass_subtitles (ContentTime next);
 
-	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
-	boost::shared_ptr<const DCPContent> _dcp_content;
 	/** Time of next thing to return from pass relative to the start of _reel */
 	ContentTime _next;
 	std::list<boost::shared_ptr<dcp::Reel> > _reels;
@@ -69,4 +71,7 @@ private:
 	boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
 	/** Reader for current sound asset, if applicable */
 	boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+
+	bool _decode_referenced;
+	boost::optional<int> _forced_reduction;
 };