X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=27f0b114144187e02acdc882bef93a0c8dfdb82c;hb=d7ac100c0eb1b5efdcfbec59be870fd869252840;hp=181fc6c2ab8869dc96f5269600f69017d362d631;hpb=9b7e3d7d992f64da4bc78bc99d1eb706f181b798;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 181fc6c2a..27f0b1141 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-2016 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,31 +45,15 @@ public:
 
 	boost::shared_ptr<VideoDecoder> video;
 	boost::shared_ptr<AudioDecoder> audio;
-	boost::shared_ptr<SubtitleDecoder> subtitle;
+	boost::shared_ptr<TextDecoder> subtitle;
 
-	enum PassReason {
-		PASS_REASON_VIDEO,
-		PASS_REASON_AUDIO,
-		PASS_REASON_SUBTITLE
-	};
-
-	/** 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.
+	/** 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 seek (ContentTime time, bool accurate) = 0;
-
-	/** @return true if this decoder has already returned all its data and will give no more */
-	virtual bool pass (PassReason, bool accurate) = 0;
+	virtual bool pass () = 0;
+	virtual void seek (ContentTime time, bool accurate);
 
-	/** Ensure that any future get() calls return data that reflect
-	 *  changes in our content's settings.
-	 */
-	virtual void reset () {}
+	ContentTime position () const;
 };
 
 #endif