Some more tidying up.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/lib/combiner.h b/src/lib/combiner.h
index 062297f0d..1b7537d42 100644
--- a/src/lib/combiner.h
+++ b/src/lib/combiner.h
@@ -21,17 +21,18 @@
  *  @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 (boost::shared_ptr<Log> log);
+	Combiner ();
 
 	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);