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 a8a67ee72624224afdb4af65db9d4522a7a6f23a..93c212b344c97c2b9277e4be45a6a2d0d8209115 100644 (file)
--- 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>
 
@@ -34,7 +35,6 @@ class VideoDecoder;
 class AudioDecoder;
 class TextDecoder;
 class DecoderPart;
-class Film;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -42,6 +42,7 @@ class Film;
 class Decoder : public boost::noncopyable
 {
 public:
+       Decoder (boost::weak_ptr<const Film> film);
        virtual ~Decoder () {}
 
        boost::shared_ptr<VideoDecoder> video;
@@ -53,10 +54,16 @@ public:
        /** 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 (boost::shared_ptr<const Film> film) = 0;
-       virtual void seek (boost::shared_ptr<const Film> film, ContentTime time, bool accurate);
+       virtual bool pass () = 0;
+       virtual void seek (ContentTime time, bool accurate);
 
-       ContentTime position (boost::shared_ptr<const Film> film) const;
+       virtual ContentTime position () const;
+
+protected:
+       boost::shared_ptr<const Film> film () const;
+
+private:
+       boost::weak_ptr<const Film> _film;
 };
 
 #endif