X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=92082ca18b105a62f9dd9aec909625c12ac875c9;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=1b330316ecc7c5c8812720ba4c8f1835f12fda9c;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 1b330316e..92082ca18 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -26,6 +26,7 @@
 #define DCPOMATIC_DECODER_H
 
 #include "types.h"
+#include "film.h"
 #include "dcpomatic_time.h"
 #include <boost/utility.hpp>
 
@@ -41,21 +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;
-	std::list<boost::shared_ptr<TextDecoder> > caption;
+	std::list<boost::shared_ptr<TextDecoder> > text;
 
-	boost::shared_ptr<TextDecoder> only_caption () const;
+	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);
 
-	ContentTime position () const;
+	dcpomatic::ContentTime position () const;
+
+protected:
+	boost::shared_ptr<const Film> film () const;
+
+private:
+	boost::weak_ptr<const Film> _film;
 };
 
 #endif