Split timed from untimed sinks / sources. Should produce same output, in theory.

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

diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 68aafd2a24d97d65b183dfcf97f0edd97a5fb48c..e628f3a8425a8eeb3754106e06f1dd4211d6b958 100644 (file)
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -23,7 +23,7 @@
 using boost::shared_ptr;
 
 Combiner::Combiner (Log* log)
-       : VideoProcessor (log)
+       : Processor (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>)
+Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, double)
 {
        _image = image;
 }
@@ -43,7 +43,7 @@ Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>)
  *  @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)
+Combiner::process_video_b (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub, double t)
 {
        /* 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);
+       Video (_image, false, sub, t);
        _image.reset ();
 }