X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=38556c8188a3932a319c5c3c3a7e463fa0fde435;hb=9c5a7319d807063c22d6bc165ee414ce82e26965;hp=aa36d41b496341ea7d8d66b8436171b11231e5b9;hpb=097a1fb413bbbb89182161d4c1a31daa5419ec96;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index aa36d41b4..38556c818 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -28,7 +28,9 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
 #include "types.h"
+#include "dcpomatic_time.h"
 
+class Decoded;
 class Film;
 
 /** @class Decoder.
@@ -37,29 +39,18 @@ class Film;
 class Decoder : public boost::noncopyable
 {
 public:
-	Decoder (boost::shared_ptr<const Film>);
 	virtual ~Decoder () {}
 
-	/** Perform one decode pass of the content, which may or may not
-	 *  cause the object to emit some data.
-	 */
-	virtual void pass () = 0;
-
+protected:	
 	/** 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.
+	 *  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.
 	 */
-	virtual void seek (DCPTime time, bool accurate) = 0;
-
-	virtual bool done () const = 0;
-
-protected:
-
-	virtual void flush () {};
-	
-	/** The Film that we are decoding in */
-	boost::weak_ptr<const Film> _film;
+	virtual void seek (ContentTime time, bool accurate) = 0;
+	virtual bool pass () = 0;
 };
 
 #endif