Merge master.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index edb532b9cc8474e0e474ac882d95d114fae71925..cfca6867f652d3fc9d2d5be7320d75128060cffe 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -29,8 +29,6 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
-#include "video_source.h"
-#include "audio_source.h"
 #include "film.h"
 
 class Image;
@@ -54,23 +52,7 @@ 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.
-        *  @param a true to try hard to be accurate, otherwise false.
-        */
-       virtual void seek (Time) = 0;
-
-       /** Seek back one video frame */
-       virtual void seek_back () = 0;
-
-       /** Seek forward one video frame */
-       virtual void seek_forward () = 0;
-
-       /** @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: