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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 2bc462c33..d67592ed8 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,59 +21,36 @@
  *  @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 "options.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.
- *
- *  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>, DecodeOptions);
+	Decoder (boost::shared_ptr<const Film>);
 	virtual ~Decoder () {}
 
-	virtual bool pass () = 0;
-	virtual bool seek (double);
-	virtual bool seek_to_last ();
-	virtual void seek_back () {}
-	virtual void seek_forward () {}
-
-	boost::signals2::signal<void()> OutputChanged;
+	/** Perform one decode pass of the content, which may or may not
+	 *  cause the object to emit some data.
+	 */
+	virtual void pass () = 0;
+	virtual bool done () const = 0;
 
 protected:
-	/** our Film */
-	boost::shared_ptr<Film> _film;
-	/** our decode options */
-	DecodeOptions _opt;
 
-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