X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.h;h=b0c263d07823f6450a6daa725a63bb6852df5976;hb=7d262f9be3a4c5d8da07dce42f7e2da708f6c7f4;hp=4a9667b3c5165b95aa9f8aeea2786b206f184b56;hpb=2247247a5294af70890cf68f3f9be930f3729d95;p=dcpomatic.git

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 4a9667b3c..b0c263d07 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -18,26 +18,26 @@
 */
 
 /** @file  src/transcoder.h
- *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
+ *  @brief A class which takes a Film and some Options, then uses those to transcode the film.
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
  *  as a parameter to the constructor.
  */
 
+#include "decoder_factory.h"
+
 class Film;
 class Job;
 class Encoder;
-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.
+ *  @brief A class which takes a Film and some Options, then uses those to transcode the film.
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
  *  as a parameter to the constructor.
@@ -45,12 +45,17 @@ class Options;
 class Transcoder
 {
 public:
-	Transcoder (boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j, boost::shared_ptr<Encoder> e);
+	Transcoder (
+		boost::shared_ptr<Film> f,
+		DecodeOptions o,
+		Job* j,
+		boost::shared_ptr<Encoder> e
+		);
 
 	void go ();
 
 	boost::shared_ptr<VideoDecoder> video_decoder () const {
-		return _decoders.first;
+		return _decoders.video;
 	}
 
 protected:
@@ -59,7 +64,7 @@ protected:
 	/** The encoder that we will use */
 	boost::shared_ptr<Encoder> _encoder;
 	/** The decoders that we will use */
-	std::pair<boost::shared_ptr<VideoDecoder>, boost::shared_ptr<AudioDecoder> > _decoders;
+	Decoders _decoders;
 	boost::shared_ptr<Matcher> _matcher;
 	boost::shared_ptr<DelayLine> _delay_line;
 	boost::shared_ptr<Gain> _gain;