X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fab_transcoder.h;h=54d7ed0be3f336862f43b879ce99b8299c60c6c7;hb=540aac0bc5ca6cbf393c650e97236a9677124a30;hp=c951329f2bfc6eeefdc00687a13980f60da7db73;hpb=4fbd1901fdabc829cfa7e7d4d0c1272bba87033c;p=dcpomatic.git

diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index c951329f2..54d7ed0be 100644
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -28,13 +28,11 @@
 
 class Job;
 class Encoder;
-class VideoDecoder;
-class AudioDecoder;
-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
@@ -46,24 +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>, 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;
-	std::pair<boost::shared_ptr<VideoDecoder>, boost::shared_ptr<AudioDecoder> > _da;
-	std::pair<boost::shared_ptr<VideoDecoder>, boost::shared_ptr<AudioDecoder> > _db;
+	boost::shared_ptr<Combiner> _combiner;
 	boost::shared_ptr<Image> _image;
 };