X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=f2f5235168402c136e9c133ac8865c11396a99c7;hb=a00ebbc68438e84076c65e99d0e70403afb4407d;hp=a458c348b04e7195aa890ec958058db53a6556cb;hpb=5161626c3c28ba528511a8b211286a5e81a0f02a;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index a458c348b..f2f523516 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -33,101 +33,45 @@
 #include "stream.h"
 #include "video_source.h"
 #include "audio_source.h"
+#include "film.h"
+#include "options.h"
 
-class Job;
-class Options;
 class Image;
 class Log;
 class DelayLine;
 class TimedSubtitle;
 class Subtitle;
-class Film;
 class FilterGraph;
 
 /** @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.
+ *  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 : public VideoSource, public AudioSource
+class Decoder
 {
 public:
-	Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+	Decoder (boost::shared_ptr<Film>, DecodeOptions);
 	virtual ~Decoder () {}
 
-	/* Methods to query our input video */
-
-	/** @return video frames per second, or 0 if unknown */
-	virtual float frames_per_second () const = 0;
-	/** @return native size in pixels */
-	virtual Size native_size () const = 0;
-
-	virtual int time_base_numerator () const = 0;
-	virtual int time_base_denominator () const = 0;
-	virtual int sample_aspect_ratio_numerator () const = 0;
-	virtual int sample_aspect_ratio_denominator () const = 0;
-	
 	virtual bool pass () = 0;
-	void go ();
-
-	SourceFrame video_frame () const {
-		return _video_frame;
-	}
-
-	virtual void set_audio_stream (boost::optional<AudioStream>);
-	virtual void set_subtitle_stream (boost::optional<SubtitleStream>);
+	virtual bool seek (double);
+	virtual bool seek_to_last ();
 
-	boost::optional<AudioStream> audio_stream () const {
-		return _audio_stream;
-	}
-
-	boost::optional<SubtitleStream> subtitle_stream () const {
-		return _subtitle_stream;
-	}
-
-	std::vector<AudioStream> audio_streams () const {
-		return _audio_streams;
-	}
-	
-	std::vector<SubtitleStream> subtitle_streams () const {
-		return _subtitle_streams;
-	}
+	boost::signals2::signal<void()> OutputChanged;
 
 protected:
-	
-	virtual PixelFormat pixel_format () const = 0;
-	
-	void process_video (AVFrame const *);
-	void process_audio (boost::shared_ptr<AudioBuffers>);
-	void process_subtitle (boost::shared_ptr<TimedSubtitle>);
-	void repeat_last_video ();
-
 	/** our Film */
 	boost::shared_ptr<Film> _film;
-	/** our options */
-	boost::shared_ptr<const Options> _opt;
-	/** associated Job, or 0 */
-	Job* _job;
-
-	boost::optional<AudioStream> _audio_stream;
-	boost::optional<SubtitleStream> _subtitle_stream;
+	/** our decode options */
+	DecodeOptions _opt;
 
-	std::vector<AudioStream> _audio_streams;
-	std::vector<SubtitleStream> _subtitle_streams;
-	
 private:
-	void emit_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-	SourceFrame _video_frame;
-
-	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
-
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-	boost::shared_ptr<Image> _last_image;
-	boost::shared_ptr<Subtitle> _last_subtitle;
+	virtual void film_changed (Film::Property) {}
+	
+	boost::signals2::scoped_connection _film_connection;
 };
 
 #endif