X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcombiner.cc;h=12ce4a96e289b6c09da748808f28dac6ed629526;hb=7d262f9be3a4c5d8da07dce42f7e2da708f6c7f4;hp=b85dbf288fba6a2bdc741744e470060e0c585d3c;hpb=288e7e64e9be84b8dbe11f5acb490e64a29d9378;p=dcpomatic.git

diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index b85dbf288..12ce4a96e 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -22,18 +22,18 @@
 
 using boost::shared_ptr;
 
-Combiner::Combiner (Log* log)
+Combiner::Combiner (shared_ptr<Log> log)
 	: VideoProcessor (log)
 {
 
 }
 
 /** Process video for the left half of the frame.
+ *  Subtitle parameter will be ignored.
  *  @param image Frame image.
- *  @param sub Subtitle (which will be ignored)
  */
 void
-Combiner::process_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
+Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>)
 {
 	_image = image;
 }
@@ -43,7 +43,7 @@ Combiner::process_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
  *  @param sub Subtitle (which will be put onto the whole frame)
  */
 void
-Combiner::process_video_b (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
+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, shared_ptr<Subtitle> sub)
 		}
 	}
 
-	Video (_image, sub);
+	Video (_image, false, sub);
 	_image.reset ();
 }