X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=acc77a814920630582c74678aee72c12ef858c13;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=0ec73ba91f47147af16b057dcef31004a0b75c47;hpb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 0ec73ba91..acc77a814 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,14 +24,13 @@
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
+#include "types.h"
+#include "dcpomatic_time.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
-#include "types.h"
-#include "dcpomatic_time.h"
 
 class Decoded;
-class Film;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -42,15 +41,25 @@ public:
 	virtual ~Decoder () {}
 
 protected:	
+	friend class AudioDecoderStream;
+	
 	/** 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 get close to
-	 *  the request.  Note that seeking to time t may mean that
-	 *  the next pass() yields, for example, audio at time t and then
-	 *  video before it.
+	 *  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;
-	virtual bool pass () = 0;
+
+	enum PassReason {
+		PASS_REASON_VIDEO,
+		PASS_REASON_AUDIO,
+		PASS_REASON_SUBTITLE
+	};
+	
+	virtual bool pass (PassReason reason) = 0;
 };
 
 #endif