Merge master; fix crash on new film.

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

diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index 7bfcb393cb32182d833bde5cc52eeae0e47327a1..1fef66b8870a3ae72de2d8a645e056d656239350 100644 (file)
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -25,21 +25,18 @@
 #include <boost/shared_ptr.hpp>
 #include <stdint.h>
 #include "util.h"
-#include "decoder_factory.h"
 
 class Job;
 class Encoder;
-class VideoDecoder;
-class AudioDecoder;
-class DecodeOptions;
 class Image;
 class Log;
-class Subtitle;
 class Film;
 class Matcher;
 class DelayLine;
 class Gain;
 class Combiner;
+class Player;
+class Trimmer;
 
 /** @class ABTranscoder
  *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
@@ -51,9 +48,7 @@ public:
        ABTranscoder (
                boost::shared_ptr<Film> a,
                boost::shared_ptr<Film> b,
-               boost::shared_ptr<const DecodeOptions> o,
-               Job* j,
-               boost::shared_ptr<Encoder> e
+               boost::shared_ptr<Job> j
                );
        
        void go ();
@@ -61,13 +56,14 @@ public:
 private:
        boost::shared_ptr<Film> _film_a;
        boost::shared_ptr<Film> _film_b;
-       Job* _job;
+       boost::shared_ptr<Player> _player_a;
+       boost::shared_ptr<Player> _player_b;
+       boost::shared_ptr<Job> _job;
        boost::shared_ptr<Encoder> _encoder;
-       Decoders _da;
-       Decoders _db;
        boost::shared_ptr<Combiner> _combiner;
        boost::shared_ptr<Matcher> _matcher;
        boost::shared_ptr<DelayLine> _delay_line;
        boost::shared_ptr<Gain> _gain;
+       boost::shared_ptr<Trimmer> _trimmer;
        boost::shared_ptr<Image> _image;
 };