X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=18f612e538c5e645470c33cfcca91175a58a0b13;hb=05654d0e1799746a9df3ccab040c92e0ed825cac;hp=edb532b9cc8474e0e474ac882d95d114fae71925;hpb=a0f1a3d40f1c93d4432d1d4857c1620907259b2f;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index edb532b9c..18f612e53 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -18,71 +18,38 @@
 */
 
 /** @file  src/decoder.h
- *  @brief Parent class for decoders of content.
+ *  @brief Decoder class.
  */
 
 #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"
+#include "dcpomatic_time.h"
 
-class Image;
-class Log;
-class DelayLine;
-class TimedSubtitle;
-class Subtitle;
-class FilterGraph;
+class Decoded;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  */
-class Decoder
+class Decoder : public boost::noncopyable
 {
 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 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.
+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.  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 (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;
-
-protected:
-
-	/** 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;
+	virtual void seek (ContentTime time, bool accurate) = 0;
+	virtual bool pass () = 0;
 };
 
 #endif