Merge master.

[dcpomatic.git] / src / lib / decoder.h

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index d67592ed812544c644b8766bcb1b1be1c03e84de..18f612e538c5e645470c33cfcca91175a58a0b13 100644 (file)
--- 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,21 +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:
-
-       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