1 files changed, 10 insertions, 12 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index d67592ed8..df3ac4f39 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -27,7 +27,10 @@
 #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.
@@ -36,21 +39,16 @@ 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.
+protected:	
+	/** Seek so that the next peek() 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.
 	 */
-	virtual void pass () = 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