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

diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index 491205ef7..54d7ed0be 100644
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -18,53 +18,42 @@
 */
 
 /** @file src/ab_transcoder.h
- *  @brief A transcoder which uses one FilmState for the left half of the screen, and a different one
+ *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
  *  for the right half (to facilitate A/B comparisons of settings)
  */
 
 #include <boost/shared_ptr.hpp>
 #include <stdint.h>
+#include "util.h"
 
 class Job;
 class Encoder;
-class Decoder;
-class FilmState;
-class Options;
 class Image;
 class Log;
-class Subtitle;
+class Film;
+class Combiner;
+class Player;
 
 /** @class ABTranscoder
- *  @brief A transcoder which uses one FilmState for the left half of the screen, and a different one
+ *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
  *  for the right half (to facilitate A/B comparisons of settings)
  */
 class ABTranscoder
 {
 public:
 	ABTranscoder (
-		boost::shared_ptr<const FilmState> a,
-		boost::shared_ptr<const FilmState> b,
-		boost::shared_ptr<const Options> o,
-		Job* j,
-		Log* l,
-		boost::shared_ptr<Encoder> e
+		boost::shared_ptr<Film> a,
+		boost::shared_ptr<Film> b,
+		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<const FilmState> _fs_a;
-	boost::shared_ptr<const FilmState> _fs_b;
-	boost::shared_ptr<const Options> _opt;
-	Job* _job;
-	Log* _log;
+	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;
 };