Merge branch 'master' of /home/carl/git/dvdomatic

[dcpomatic.git] / src / lib / transcoder.h

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 4a9667b3c5165b95aa9f8aeea2786b206f184b56..b50113742369c817aa3e0b57d28158f31d111b41 100644 (file)
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -24,6 +24,8 @@
  *  as a parameter to the constructor.
  */
 
+#include "decoder_factory.h"
+
 class Film;
 class Job;
 class Encoder;
@@ -34,7 +36,8 @@ class Gain;
 class VideoDecoder;
 class AudioDecoder;
 class DelayLine;
-class Options;
+class EncodeOptions;
+class DecodeOptions;
 
 /** @class Transcoder
  *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
@@ -45,12 +48,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,
+               boost::shared_ptr<const 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 +67,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;