X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=d67592ed812544c644b8766bcb1b1be1c03e84de;hb=a3241f40b061480a0907699a5857075388216643;hp=b550bf5cbe55e990eadd13aa95baab47a7f3f010;hpb=f45cbb73068321d857249aaa21f770b87493c7c2;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index b550bf5cb..d67592ed8 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -24,26 +24,16 @@
 #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>
 
-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>);
@@ -53,38 +43,14 @@ public:
 	 *  cause the object to emit some data.
 	 */
 	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:
 
+	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