Merge.

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

diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index 9b57e4f73497c2accbde989f135fb148a9522b3b..58a08af04ca7fbe67eddd78937af60c0fd53b51d 100644 (file)
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -25,12 +25,12 @@
 #include <boost/shared_ptr.hpp>
 #include <stdint.h>
 #include "util.h"
+#include "decoder_factory.h"
 
 class Job;
 class Encoder;
 class VideoDecoder;
 class AudioDecoder;
-class Options;
 class Image;
 class Log;
 class Subtitle;
@@ -50,7 +50,7 @@ public:
        ABTranscoder (
                boost::shared_ptr<Film> a,
                boost::shared_ptr<Film> b,
-               boost::shared_ptr<const Options> o,
+               DecodeOptions o,
                Job* j,
                boost::shared_ptr<Encoder> e
                );
@@ -60,11 +60,10 @@ public:
 private:
        boost::shared_ptr<Film> _film_a;
        boost::shared_ptr<Film> _film_b;
-       boost::shared_ptr<const Options> _opt;
        Job* _job;
        boost::shared_ptr<Encoder> _encoder;
-       std::pair<boost::shared_ptr<VideoDecoder>, boost::shared_ptr<AudioDecoder> > _da;
-       std::pair<boost::shared_ptr<VideoDecoder>, boost::shared_ptr<AudioDecoder> > _db;
+       Decoders _da;
+       Decoders _db;
        boost::shared_ptr<Combiner> _combiner;
        boost::shared_ptr<Matcher> _matcher;
        boost::shared_ptr<DelayLine> _delay_line;