X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcombiner.h;h=1b7537d42b0eff64d6c85a4c408366fd84385179;hb=e8819ad7580f25eea7ca3c59cf0a3979d76a6b44;hp=062297f0dca31824f2ff262c2d7cf9a9fc318c24;hpb=929b4c37eaf9593892f61df80309a8c8ad6c05a0;p=dcpomatic.git 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); + Combiner (); void process_video (boost::shared_ptr i, bool, boost::shared_ptr s, Time); void process_video_b (boost::shared_ptr i, bool, boost::shared_ptr s, Time);