X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=908d3aae51c3948803199af980ae4f7bb1e1f157;hb=ea910e250a0fb3b0ad3ce0cf32dd27b24c17cd1d;hp=3908afa2fbfed522b24266846925fad693ee374f;hpb=0330d9b2924767d9240c5a25e9ed4327eb0a73bd;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 3908afa2f..908d3aae5 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,60 +21,45 @@
  *  @brief Parent class for decoders of content.
  */
 
-#ifndef DVDOMATIC_DECODER_H
-#define DVDOMATIC_DECODER_H
+#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 "util.h"
-#include "stream.h"
-#include "video_source.h"
-#include "audio_source.h"
-#include "film.h"
+#include <boost/weak_ptr.hpp>
+#include <boost/utility.hpp>
+#include "types.h"
 
-class Job;
-class DecodeOptions;
-class Image;
-class Log;
-class DelayLine;
-class TimedSubtitle;
-class Subtitle;
-class FilterGraph;
+class Film;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
- *
- *  These classes can be instructed run through their content (by
- *  calling ::go), and they emit signals when video or audio data is
- *  ready for something else to process.
  */
-class Decoder
+class Decoder : public boost::noncopyable
 {
 public:
-	Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const DecodeOptions>, Job *);
+	Decoder (boost::shared_ptr<const Film>);
 	virtual ~Decoder () {}
 
-	virtual bool pass () = 0;
-	virtual bool seek (double);
-	virtual bool seek_to_last ();
+	/** Perform one decode pass of the content, which may or may not
+	 *  cause the object to emit some data.
+	 */
+	virtual void pass () = 0;
 
-	boost::signals2::signal<void()> OutputChanged;
+	/** 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 time, bool accurate) = 0;
+
+	virtual bool done () const = 0;
 
 protected:
-	/** our Film */
-	boost::shared_ptr<Film> _film;
-	/** our options */
-	boost::shared_ptr<const DecodeOptions> _opt;
-	/** associated Job, or 0 */
-	Job* _job;
 
-private:
-	virtual void film_changed (Film::Property) {}
+	virtual void flush () {};
 	
-	boost::signals2::scoped_connection _film_connection;
+	/** The Film that we are decoding in */
+	boost::weak_ptr<const Film> _film;
 };
 
 #endif