Merge master.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 6646b0e76acc66b14edb78d698bd9c48412e07c4..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
@@ -28,8 +28,8 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
 #include "types.h"
+#include "dcpomatic_time.h"
 
-class Film;
 class Decoded;
 
 /** @class Decoder.
@@ -38,35 +38,18 @@ class Decoded;
 class Decoder : public boost::noncopyable
 {
 public:
-       Decoder (boost::shared_ptr<const Film>);
        virtual ~Decoder () {}
 
-       /** Seek so that the next get_*() will yield the next thing
+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.
-        */
-       virtual void seek (ContentTime time, bool accurate);
-       
-       boost::shared_ptr<Decoded> peek ();
-       void consume ();
-
-protected:
-
-       /** Perform one decode pass of the content, which may or may not
-        *  result in a complete quantum (Decoded object) of decoded stuff
-        *  being made ready.
-        *  @return true if the decoder is done (i.e. no more data will be
-        *  produced by any future calls to pass() without a seek() first).
+        *  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 (ContentTime time, bool accurate) = 0;
        virtual bool pass () = 0;
-       virtual void flush () {};
-       
-       /** The Film that we are decoding in */
-       boost::weak_ptr<const Film> _film;
-
-       std::list<boost::shared_ptr<Decoded> > _pending;
-       bool _done;
 };
 
 #endif