X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=92082ca18b105a62f9dd9aec909625c12ac875c9;hb=70f5ab36c2b985b8b82aea3187964de41930fc94;hp=26035d221080a5304cbccdde0bcf4490c78550bf;hpb=eb135e8dcdf36ae82420bcd18e954ad593b3e9a5;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 26035d221..92082ca18 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,13 +26,14 @@
 #define DCPOMATIC_DECODER_H
 
 #include "types.h"
+#include "film.h"
 #include "dcpomatic_time.h"
 #include <boost/utility.hpp>
 
 class Decoded;
 class VideoDecoder;
 class AudioDecoder;
-class SubtitleDecoder;
+class TextDecoder;
 class DecoderPart;
 
 /** @class Decoder.
@@ -41,17 +42,28 @@ class DecoderPart;
 class Decoder : public boost::noncopyable
 {
 public:
+	Decoder (boost::weak_ptr<const Film> film);
 	virtual ~Decoder () {}
 
 	boost::shared_ptr<VideoDecoder> video;
 	boost::shared_ptr<AudioDecoder> audio;
-	boost::shared_ptr<SubtitleDecoder> subtitle;
+	std::list<boost::shared_ptr<TextDecoder> > text;
 
-	/** @return true if there is no more data to come from this decoder */
+	boost::shared_ptr<TextDecoder> only_text () const;
+
+	/** Do some decoding and perhaps emit video, audio or subtitle data.
+	 *  @return true if this decoder will emit no more data unless a seek() happens.
+	 */
 	virtual bool pass () = 0;
-	virtual void seek (ContentTime time, bool accurate) = 0;
+	virtual void seek (dcpomatic::ContentTime time, bool accurate);
+
+	dcpomatic::ContentTime position () const;
+
+protected:
+	boost::shared_ptr<const Film> film () const;
 
-	ContentTime position () const;
+private:
+	boost::weak_ptr<const Film> _film;
 };
 
 #endif