X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcombiner.h;h=1b7537d42b0eff64d6c85a4c408366fd84385179;hb=e8819ad7580f25eea7ca3c59cf0a3979d76a6b44;hp=7fad1aeae84d44a486bb1d2b09b680274669e5c0;hpb=2f56f38ce56b36f20d59593f56981e7ed330c484;p=dcpomatic.git

diff --git a/src/lib/combiner.h b/src/lib/combiner.h
index 7fad1aeae..1b7537d42 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 VideoProcessor
+class Combiner : public VideoSource, public VideoSink
 {
 public:
-	Combiner (Log* log);
+	Combiner ();
 
-	void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s);
-	void process_video_b (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s);
+	void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, Time);
+	void process_video_b (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, Time);
 
 private:
 	/** The image that we are currently working on */