X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=803c93a86f308c5cf2adddeac502977a2351a46b;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=a4dfbad4e5304f55d07ce2ff809b719708be162a;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index a4dfbad4e..803c93a86 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -26,7 +26,6 @@
 
 #include "atmos_metadata.h"
 #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>
@@ -42,12 +41,12 @@ class Log;
 struct dcp_subtitle_within_dcp_test;
 
 
-class DCPDecoder : public DCP, public Decoder
+class DCPDecoder : public Decoder
 {
 public:
 	DCPDecoder (
 		std::shared_ptr<const Film> film,
-		std::shared_ptr<const DCPContent>,
+		std::shared_ptr<const DCPContent> content,
 		bool fast,
 		bool tolerant,
 		std::shared_ptr<DCPDecoder> old
@@ -63,8 +62,6 @@ public:
 	bool pass () override;
 	void seek (dcpomatic::ContentTime t, bool accurate) override;
 
-	std::vector<dcpomatic::FontData> fonts () const override;
-
 	std::string lazy_digest () const {
 		return _lazy_digest;
 	}
@@ -87,6 +84,8 @@ private:
 		);
 	std::string calculate_lazy_digest (std::shared_ptr<const DCPContent>) const;
 
+	std::shared_ptr<const DCPContent> _dcp_content;
+
 	/** Time of next thing to return from pass relative to the start of _reel */
 	dcpomatic::ContentTime _next;
 	std::vector<std::shared_ptr<dcp::Reel>> _reels;