Untested external audio support; AB transcodes still broken.

1 files changed, 5 insertions, 62 deletions

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 805f6e521..cd033b5f9 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -47,84 +47,27 @@ 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 *);
 	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>);
-
-	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;
-	}
 
 protected:
+	virtual void set_progress () const {}
 	
-	virtual PixelFormat pixel_format () const = 0;
-	
-	void emit_video (boost::shared_ptr<Image>);
-	void emit_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;
-
-	std::vector<AudioStream> _audio_streams;
-	std::vector<SubtitleStream> _subtitle_streams;
-	
-private:
-	void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-	SourceFrame _video_frame;
-
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-	boost::shared_ptr<Image> _last_image;
-	boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif