X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcombiner.cc;h=12ce4a96e289b6c09da748808f28dac6ed629526;hb=ba0a895137b630f5d308b123ef886d68090f855d;hp=e628f3a8425a8eeb3754106e06f1dd4211d6b958;hpb=18614dda0d53b713ace5ad1df57298d049dba87f;p=dcpomatic.git

diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index e628f3a84..12ce4a96e 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -22,8 +22,8 @@
 
 using boost::shared_ptr;
 
-Combiner::Combiner (Log* log)
-	: Processor (log)
+Combiner::Combiner (shared_ptr<Log> log)
+	: VideoProcessor (log)
 {
 
 }
@@ -33,7 +33,7 @@ Combiner::Combiner (Log* log)
  *  @param image Frame image.
  */
 void
-Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, double)
+Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>)
 {
 	_image = image;
 }
@@ -43,7 +43,7 @@ Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, do
  *  @param sub Subtitle (which will be put onto the whole frame)
  */
 void
-Combiner::process_video_b (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub, double t)
+Combiner::process_video_b (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub)
 {
 	/* Copy the right half of this image into our _image */
 	/* XXX: this should probably be in the Image class */
@@ -62,6 +62,6 @@ Combiner::process_video_b (shared_ptr<Image> image, bool, shared_ptr<Subtitle> s
 		}
 	}
 
-	Video (_image, false, sub, t);
+	Video (_image, false, sub);
 	_image.reset ();
 }