summaryrefslogtreecommitdiff
path: root/src/lib/matcher.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-06 00:51:44 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-06 00:51:44 +0000
commit422341d1cb6bc8cbb6be76eac239c40cb4061c79 (patch)
tree1a4193e699024bd53f5ef2da5d9958aa74ffbd06 /src/lib/matcher.cc
parent18614dda0d53b713ace5ad1df57298d049dba87f (diff)
Revert "Split timed from untimed sinks / sources. Should produce same output, in theory."
This reverts commit 18614dda0d53b713ace5ad1df57298d049dba87f.
Diffstat (limited to 'src/lib/matcher.cc')
-rw-r--r--src/lib/matcher.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/matcher.cc b/src/lib/matcher.cc
index 3a513b24e..4cd264338 100644
--- a/src/lib/matcher.cc
+++ b/src/lib/matcher.cc
@@ -27,7 +27,7 @@ using std::min;
using boost::shared_ptr;
Matcher::Matcher (Log* log, int sample_rate, float frames_per_second)
- : Processor (log)
+ : AudioVideoProcessor (log)
, _sample_rate (sample_rate)
, _frames_per_second (frames_per_second)
, _video_frames (0)
@@ -37,7 +37,7 @@ Matcher::Matcher (Log* log, int sample_rate, float frames_per_second)
}
void
-Matcher::process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s, double)
+Matcher::process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s)
{
Video (i, same, s);
_video_frames++;
@@ -47,7 +47,7 @@ Matcher::process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr
}
void
-Matcher::process_audio (boost::shared_ptr<AudioBuffers> b, double)
+Matcher::process_audio (boost::shared_ptr<AudioBuffers> b)
{
Audio (b);
_audio_frames += b->frames ();