X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=496d95740d63cf26e9c74024dd43f506416cbf7b;hb=96f7dd41a2c8627bc1ea0d24d84142eb04b4ffef;hp=2fbdb884a3f808b37087d008a2ba887c4ee8f35f;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 2fbdb884a..496d95740 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -40,7 +40,13 @@ struct dcp_subtitle_within_dcp_test;
 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 Film> film,
+		boost::shared_ptr<const DCPContent>,
+		bool fast,
+		bool tolerant,
+		boost::shared_ptr<DCPDecoder> old
+		);
 
 	std::list<boost::shared_ptr<dcp::Reel> > reels () const {
 		return _reels;
@@ -50,18 +56,30 @@ public:
 	void set_forced_reduction (boost::optional<int> reduction);
 
 	bool pass ();
-	void seek (ContentTime t, bool accurate);
+	void seek (dcpomatic::ContentTime t, bool accurate);
+
+	std::string lazy_digest () const {
+		return _lazy_digest;
+	}
 
 private:
 	friend struct dcp_subtitle_within_dcp_test;
 
 	void next_reel ();
 	void get_readers ();
-	void pass_captions (ContentTime next);
-	void pass_captions (ContentTime next, boost::shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, boost::shared_ptr<TextDecoder> decoder);
+	void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
+	void pass_texts (
+		dcpomatic::ContentTime next,
+		boost::shared_ptr<dcp::SubtitleAsset> asset,
+		bool reference,
+		int64_t entry_point,
+		boost::shared_ptr<TextDecoder> decoder,
+		dcp::Size size
+		);
+	std::string calculate_lazy_digest (boost::shared_ptr<const DCPContent>) const;
 
 	/** Time of next thing to return from pass relative to the start of _reel */
-	ContentTime _next;
+	dcpomatic::ContentTime _next;
 	std::list<boost::shared_ptr<dcp::Reel> > _reels;
 
 	std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
@@ -76,4 +94,6 @@ private:
 
 	bool _decode_referenced;
 	boost::optional<int> _forced_reduction;
+
+	std::string _lazy_digest;
 };