X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcombiner.cc;h=ca68ef68afb7d11a9834fd6f0f340226c4507e09;hb=f385ef03e5ea27519a31c0839447735a7fba0602;hp=0a9eaf6b60bf8e12d2689ade030c7f16c50f0081;hpb=09bcbfa0c118bd523586f985b602d16cf183ac36;p=dcpomatic.git

diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 0a9eaf6b6..ca68ef68a 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -22,8 +22,7 @@
 
 using boost::shared_ptr;
 
-Combiner::Combiner (shared_ptr<Log> log)
-	: TimedVideoProcessor (log)
+Combiner::Combiner ()
 {
 
 }
@@ -33,9 +32,9 @@ Combiner::Combiner (shared_ptr<Log> log)
  *  @param image Frame image.
  */
 void
-Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, double)
+Combiner::process_video (shared_ptr<const Image> image, bool, Time)
 {
-	_image = image;
+	_image.reset (new SimpleImage (image));
 }
 
 /** Process video for the right half of the frame.
@@ -43,25 +42,24 @@ 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<const Image> image, bool, Time t)
 {
 	/* Copy the right half of this image into our _image */
 	/* XXX: this should probably be in the Image class */
 	for (int i = 0; i < image->components(); ++i) {
 		int const line_size = image->line_size()[i];
 		int const half_line_size = line_size / 2;
-		int const stride = image->stride()[i];
 
 		uint8_t* p = _image->data()[i];
 		uint8_t* q = image->data()[i];
 			
 		for (int j = 0; j < image->lines (i); ++j) {
 			memcpy (p + half_line_size, q + half_line_size, half_line_size);
-			p += stride;
-			q += stride;
+			p += _image->stride()[i];
+			q += image->stride()[i];
 		}
 	}
 
-	Video (_image, false, sub, t);
+	Video (_image, false, t);
 	_image.reset ();
 }