X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcombiner.h;h=46c90b4d8129e56aff5fa47f9b043f2ef0f5bcbe;hb=46cd0fe7b5b514f0d9456b25f670679cc584a218;hp=7ed316e26934cd663a0ab9ae92aa64d4ddca8952;hpb=87a709a4ea5dffaadaf35ef94edb4b578eb3b56c;p=dcpomatic.git

diff --git a/src/lib/combiner.h b/src/lib/combiner.h
index 7ed316e26..46c90b4d8 100644
--- a/src/lib/combiner.h
+++ b/src/lib/combiner.h
@@ -21,20 +21,21 @@
  *  @brief Class for combining two video streams.
  */
 
-#include "processor.h"
+#include "video_source.h"
+#include "video_sink.h"
 
 /** @class Combiner
  *  @brief A class which can combine two video streams into one, with
  *  one image used for the left half of the screen and the other for
  *  the right.
  */
-class Combiner : public TimedVideoProcessor
+class Combiner : public VideoSource, public VideoSink
 {
 public:
-	Combiner (boost::shared_ptr<Log> log);
+	Combiner ();
 
-	void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
-	void process_video_b (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
+	void process_video (boost::shared_ptr<const Image> i, bool, Time);
+	void process_video_b (boost::shared_ptr<const Image> i, bool, Time);
 
 private:
 	/** The image that we are currently working on */