Various work on better seeking (and seeking of audio).

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index be9555dc4ffccb21b1c45ebd3d7fda4880d96e13..908d3aae51c3948803199af980ae4f7bb1e1f157 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -24,26 +24,17 @@
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include <vector>
-#include <string>
-#include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include "video_source.h"
-#include "audio_source.h"
-#include "film.h"
+#include <boost/weak_ptr.hpp>
+#include <boost/utility.hpp>
+#include "types.h"
 
-class Image;
-class Log;
-class DelayLine;
-class TimedSubtitle;
-class Subtitle;
-class FilterGraph;
+class Film;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  */
-class Decoder
+class Decoder : public boost::noncopyable
 {
 public:
        Decoder (boost::shared_ptr<const Film>);
@@ -54,34 +45,21 @@ public:
         */
        virtual void pass () = 0;
 
-       /** Seek this decoder to as close as possible to some time,
-        *  expressed relative to our source's start.
-        *  @param t Time.
+       /** 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 (Time) {}
+       virtual void seek (Time time, bool accurate) = 0;
 
-       /** Seek back one video frame */
-       virtual void seek_back () {}
-
-       /** Seek forward one video frame */
-       virtual void seek_forward () {}
-
-       /** @return Approximate time of the next content that we will emit,
-        *  expressed relative to the start of our source.
-        */
-       virtual Time next () const = 0;
+       virtual bool done () const = 0;
 
 protected:
 
+       virtual void flush () {};
+       
        /** The Film that we are decoding in */
        boost::weak_ptr<const Film> _film;
-
-private:
-       /** This will be called when our Film emits Changed */
-       virtual void film_changed (Film::Property) {}
-
-       /** Connection to our Film */
-       boost::signals2::scoped_connection _film_connection;
 };
 
 #endif