X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=803c93a86f308c5cf2adddeac502977a2351a46b;hb=7cdfaa6ea81bbb61ba52c485bdbbfbc9e66b82e7;hp=553f05aedc433610b4c41f189a728c7cc5f65fdf;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 553f05aed..803c93a86 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,18 +18,20 @@
 
 */
 
+
 /** @file  src/dcp_decoder.h
  *  @brief A decoder of existing DCPs.
  */
 
+
 #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>
 #include <dcp/subtitle_asset.h>
 
+
 namespace dcp {
 	class Reel;
 }
@@ -38,34 +40,33 @@ class DCPContent;
 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
 		);
 
-	std::list<std::shared_ptr<dcp::Reel> > reels () const {
+	std::vector<std::shared_ptr<dcp::Reel>> reels () const {
 		return _reels;
 	}
 
 	void set_decode_referenced (bool r);
 	void set_forced_reduction (boost::optional<int> reduction);
 
-	bool pass ();
-	void seek (dcpomatic::ContentTime t, bool accurate);
-
-	std::vector<dcpomatic::FontData> fonts () const;
+	bool pass () override;
+	void seek (dcpomatic::ContentTime t, bool accurate) override;
 
 	std::string lazy_digest () const {
 		return _lazy_digest;
 	}
 
-	dcpomatic::ContentTime position () const;
+	dcpomatic::ContentTime position () const override;
 
 private:
 	friend struct dcp_subtitle_within_dcp_test;
@@ -83,13 +84,15 @@ 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::list<std::shared_ptr<dcp::Reel> > _reels;
+	std::vector<std::shared_ptr<dcp::Reel>> _reels;
 
-	std::list<std::shared_ptr<dcp::Reel> >::iterator _reel;
+	std::vector<std::shared_ptr<dcp::Reel>>::iterator _reel;
 	/** Offset of _reel from the start of the content in frames */
-	int64_t _offset;
+	int64_t _offset = 0;
 	/** Reader for current mono picture asset, if applicable */
 	std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
 	/** Reader for current stereo picture asset, if applicable */
@@ -99,7 +102,7 @@ private:
 	std::shared_ptr<dcp::AtmosAssetReader> _atmos_reader;
 	boost::optional<AtmosMetadata> _atmos_metadata;
 
-	bool _decode_referenced;
+	bool _decode_referenced = false;
 	boost::optional<int> _forced_reduction;
 
 	std::string _lazy_digest;