X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=18f612e538c5e645470c33cfcca91175a58a0b13;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hp=9eb4850f9750fa7ad967c63a7545653b82f4b642;hpb=293583097f7b25e481f0898f13c62c10aac33719;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 9eb4850f9..18f612e53 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -18,7 +18,7 @@
 */
 
 /** @file  src/decoder.h
- *  @brief Parent class for decoders of content.
+ *  @brief Decoder class.
  */
 
 #ifndef DCPOMATIC_DECODER_H
@@ -27,8 +27,10 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
+#include "types.h"
+#include "dcpomatic_time.h"
 
-class Film;
+class Decoded;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -36,20 +38,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.
+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.  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 pass () = 0;
-
-	virtual bool done () const = 0;
-
-protected:
-
-	/** 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