Give DCPDecoder its own ::position which just returns its internal

[dcpomatic.git] / src / lib / decoder.h

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index c3b330cfbcd49bdf376cba575ca52c7e5ab2d258..93c212b344c97c2b9277e4be45a6a2d0d8209115 100644 (file)
--- 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,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<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.
@@ -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