Merge master.

[dcpomatic.git] / src / lib / matcher.h

diff --git a/src/lib/matcher.h b/src/lib/matcher.h
index a7054f540bee9698039b693313d4fd7cf6c5187b..4ec0a3e96710bbc99ddda2330081ee23f3c5558a 100644 (file)
--- a/src/lib/matcher.h
+++ b/src/lib/matcher.h
@@ -21,12 +21,12 @@
 #include "processor.h"
 #include "ffmpeg_compatibility.h"
 
-class Matcher : public Processor, public TimedVideoSink, public TimedAudioSink, public VideoSource, public AudioSource
+class Matcher : public AudioVideoProcessor
 {
 public:
-       Matcher (Log* log, int sample_rate, float frames_per_second);
-       void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s, double t);
-       void process_audio (boost::shared_ptr<AudioBuffers>, double t);
+       Matcher (boost::shared_ptr<Log> log, int sample_rate, float frames_per_second);
+       void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s);
+       void process_audio (boost::shared_ptr<AudioBuffers>);
        void process_end ();
 
 private: