X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=71687ad15df1e3eabe711466f7d27cc21f78e776;hb=8c902030af1e2511c53d3738785eb7890b882a45;hp=97a1847946a6f677985824893a9096b7ab2c9971;hpb=76f83b97c401c24b3c93baee0665e84be05f43ea;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 97a184794..71687ad15 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);
@@ -44,18 +45,17 @@ public:
 		return _reels;
 	}
 
+	void set_decode_referenced ();
+
+	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 ();
 
-	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 +69,6 @@ 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;
 };