Merge master.

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

diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index 7bf5dd4a1fe412e3eafc9f460014de043a8a393f..54d7ed0be3f336862f43b879ce99b8299c60c6c7 100644 (file)
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -24,15 +24,15 @@
 
 #include <boost/shared_ptr.hpp>
 #include <stdint.h>
+#include "util.h"
 
 class Job;
 class Encoder;
-class Decoder;
-class Options;
 class Image;
 class Log;
-class Subtitle;
 class Film;
+class Combiner;
+class Player;
 
 /** @class ABTranscoder
  *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
@@ -44,25 +44,16 @@ public:
        ABTranscoder (
                boost::shared_ptr<Film> a,
                boost::shared_ptr<Film> b,
-               boost::shared_ptr<const Options> o,
-               Job* j,
-               boost::shared_ptr<Encoder> e
+               boost::shared_ptr<Job> j
                );
        
-       ~ABTranscoder ();
-
        void go ();
 
 private:
-       void process_video (boost::shared_ptr<Image>, int, boost::shared_ptr<Subtitle>, int);
-       
-       boost::shared_ptr<Film> _film_a;
-       boost::shared_ptr<Film> _film_b;
-       boost::shared_ptr<const Options> _opt;
-       Job* _job;
+       boost::shared_ptr<Player> _player_a;
+       boost::shared_ptr<Player> _player_b;
+       boost::shared_ptr<Job> _job;
        boost::shared_ptr<Encoder> _encoder;
-       boost::shared_ptr<Decoder> _da;
-       boost::shared_ptr<Decoder> _db;
-       int _last_frame;
+       boost::shared_ptr<Combiner> _combiner;
        boost::shared_ptr<Image> _image;
 };