X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=55d9cfc64b92172d35e1714708965e4672f430de;hb=3df4d6271a6a660fdce143dcd65467c402e98976;hp=84661ee8c4a1637b79a2796cce5ad1083f142e44;hpb=97d39f46795af78b84d5f7bc9118a188f2864781;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 84661ee8c..55d9cfc64 100644
--- 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.
 
@@ -32,7 +32,8 @@
 class Decoded;
 class VideoDecoder;
 class AudioDecoder;
-class SubtitleDecoder;
+class TextDecoder;
+class DecoderPart;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -44,37 +45,17 @@ public:
 
 	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 (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);
 
-protected:
-	boost::optional<ContentTime> _position;
-
-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;
+	ContentTime position () const;
 };
 
 #endif