X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=93c212b344c97c2b9277e4be45a6a2d0d8209115;hp=d87ff610ac47d3a9eae2eb795ac072a397c26b3f;hb=4285355ff2bec853924647f0523d121860fe64e3;hpb=89aa9d4ba69e471949f791cdafe4ae20cea554d2

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index d87ff610a..93c212b34 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,11 +42,14 @@ 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;
+
+	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.
@@ -53,7 +57,13 @@ public:
 	virtual bool pass () = 0;
 	virtual void seek (ContentTime time, bool accurate);
 
-	ContentTime position () const;
+	virtual ContentTime position () const;
+
+protected:
+	boost::shared_ptr<const Film> film () const;
+
+private:
+	boost::weak_ptr<const Film> _film;
 };
 
 #endif