Untested external audio support; AB transcodes still broken.

1 files changed, 6 insertions, 9 deletions

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 324a72037..e3ca2bb32 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -17,8 +17,6 @@
 
 */
 
-#include "decoder.h"
-
 /** @file  src/transcoder.h
  *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
  *
@@ -33,6 +31,10 @@ class FilmState;
 class Matcher;
 class VideoFilter;
 class Gain;
+class VideoDecoder;
+class AudioDecoder;
+class DelayLine;
+class Options;
 
 /** @class Transcoder
  *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
@@ -47,18 +49,13 @@ public:
 
 	void go ();
 
-	/** @return Our decoder */
-	boost::shared_ptr<Decoder> decoder () {
-		return _decoder;
-	}
-
 protected:
 	/** A Job that is running this Transcoder, or 0 */
 	Job* _job;
 	/** The encoder that we will use */
 	boost::shared_ptr<Encoder> _encoder;
-	/** The decoder that we will use */
-	boost::shared_ptr<Decoder> _decoder;
+	/** The decoders that we will use */
+	std::pair<boost::shared_ptr<VideoDecoder>, boost::shared_ptr<AudioDecoder> > _decoders;
 	boost::shared_ptr<Matcher> _matcher;
 	boost::shared_ptr<DelayLine> _delay_line;
 	boost::shared_ptr<Gain> _gain;