Merge master.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index aa36d41b496341ea7d8d66b8436171b11231e5b9..aeb39d0b2a05483cc2afe5f736e0534d44658d5d 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -28,8 +28,10 @@
 #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.
@@ -40,26 +42,36 @@ 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;
-
-       /** Seek so that the next pass() will yield the next thing
+       /** 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 seek (DCPTime time, bool accurate) = 0;
+       virtual void seek (ContentTime time, bool accurate);
+       
+       boost::shared_ptr<Decoded> peek ();
 
-       virtual bool done () const = 0;
+       /* Consume the last peek()ed thing so that it won't be returned
+        * from the next 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 added to _pending.
+        *  @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).
+        */
+       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