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 d2302d7a20d3057bcfde04fd9df1b11934f45420..93c212b344c97c2b9277e4be45a6a2d0d8209115 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 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,15 @@
 #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.
  *  @brief Parent class for decoders of content.
@@ -40,46 +42,28 @@ class SubtitleDecoder;
 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;
 
-       enum PassReason {
-               PASS_REASON_VIDEO,
-               PASS_REASON_AUDIO,
-               PASS_REASON_SUBTITLE
-       };
+       boost::shared_ptr<TextDecoder> only_text () const;
 
-       void maybe_seek_video (ContentTime time, bool accurate);
-       void maybe_seek_audio (ContentTime time, bool accurate);
-       void maybe_seek_subtitle (ContentTime time, bool accurate);
-
-       /** @return true if this decoder has already returned all its data and will give no more */
-       virtual bool pass (PassReason, bool accurate) = 0;
-
-       /** Ensure that any future get() calls return data that reflect
-        *  changes in our content's settings.
+       /** 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 void reset () {}
+       virtual bool pass () = 0;
+       virtual void seek (ContentTime time, bool accurate);
+
+       virtual ContentTime position () const;
 
 protected:
-       boost::optional<ContentTime> _video_position;
-       boost::optional<ContentTime> _audio_position;
-       boost::optional<ContentTime> _subtitle_position;
+       boost::shared_ptr<const Film> film () const;
 
 private:
-       /** Seek so that the next pass() will yield the next thing
-        *  (video/sound frame, subtitle etc.) at or after the requested
-        *  time.  Pass accurate = true to try harder to ensure that, at worst,
-        *  the next thing we yield comes before `time'.  This may entail
-        *  seeking some way before `time' to be on the safe side.
-        *  Alternatively, if seeking is 100% accurate for this decoder,
-        *  it may seek to just the right spot.
-        */
-       virtual void seek (ContentTime time, bool accurate) = 0;
-       void maybe_seek (boost::optional<ContentTime>& position, ContentTime time, bool accurate);
+       boost::weak_ptr<const Film> _film;
 };
 
 #endif