X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=ddea58aacbfc636c9c29d0264300155046c5378b;hb=48841aa4a4aa4704e1e054b294bac23996be6dd0;hp=c3b330cfbcd49bdf376cba575ca52c7e5ab2d258;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index c3b330cfb..ddea58aac 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -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 CaptionDecoder;
+class TextDecoder;
 class DecoderPart;
 
 /** @class Decoder.
@@ -41,19 +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<CaptionDecoder> caption;
+	std::list<boost::shared_ptr<TextDecoder> > text;
+
+	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);
+	virtual void seek (dcpomatic::ContentTime time, bool accurate);
+
+	virtual dcpomatic::ContentTime position () const;
+
+protected:
+	boost::shared_ptr<const Film> film () const;
 
-	ContentTime position () const;
+private:
+	boost::weak_ptr<const Film> _film;
 };
 
 #endif