X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=b1b26056ba6073badf2ae48982b7332ed13132d6;hb=9173d049cc256efebb6a5bf07ee98e14dc24a350;hp=b7141f91643d645e76a034e2a0e7d7b1e91bf050;hpb=7a0c2256cbf94d2434ba6e7485517df0a7f894af;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index b7141f916..b1b26056b 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -23,6 +23,10 @@
  */
 
 #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;
@@ -32,21 +36,24 @@ 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);
+	DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log);
 
 	std::list<boost::shared_ptr<dcp::Reel> > reels () const {
 		return _reels;
 	}
 
+	void set_decode_referenced ();
+
 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;
@@ -54,8 +61,16 @@ private:
 	/** Time of next thing to return from pass relative to the start of _reel */
 	ContentTime _next;
 	std::list<boost::shared_ptr<dcp::Reel> > _reels;
+
 	std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
 	/** Offset of _reel from the start of the content in frames */
 	int64_t _offset;
-	boost::shared_ptr<const DCPContent> _dcp_content;
+	/** Reader for current mono picture asset, if applicable */
+	boost::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+	/** Reader for current stereo picture asset, if applicable */
+	boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+	/** Reader for current sound asset, if applicable */
+	boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+
+	bool _decode_referenced;
 };