Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

[dcpomatic.git] / src / lib / combiner.cc

diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 0afb9807ac74a6618b3759a47dcf38ca6dc835ae..ca68ef68afb7d11a9834fd6f0f340226c4507e09 100644 (file)
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -22,8 +22,7 @@
 
 using boost::shared_ptr;
 
-Combiner::Combiner (shared_ptr<Log> log)
-       : VideoProcessor (log)
+Combiner::Combiner ()
 {
 
 }
@@ -33,7 +32,7 @@ Combiner::Combiner (shared_ptr<Log> log)
  *  @param image Frame image.
  */
 void
-Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle>, Time)
+Combiner::process_video (shared_ptr<const Image> image, bool, Time)
 {
        _image.reset (new SimpleImage (image));
 }
@@ -43,7 +42,7 @@ Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitl
  *  @param sub Subtitle (which will be put onto the whole frame)
  */
 void
-Combiner::process_video_b (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, Time 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 */
@@ -61,6 +60,6 @@ Combiner::process_video_b (shared_ptr<const Image> image, bool, shared_ptr<Subti
                }
        }
 
-       Video (_image, false, sub, t);
+       Video (_image, false, t);
        _image.reset ();
 }