Merge master and multifarious hackery.

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

diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 367cefa7f49fead4aa824798143fbf237dbeed74..db490fd34111ce86e56fe0c05d2ba5fa8d76bdc6 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)
-       : TimedVideoProcessor (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>, double)
+Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle>, 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, double t)
+Combiner::process_video_b (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, Time t)
 {
        /* Copy the right half of this image into our _image */
        /* XXX: this should probably be in the Image class */