projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A few more fixes; set up Playlist as required.
[dcpomatic.git]
/
src
/
lib
/
matcher.cc
diff --git
a/src/lib/matcher.cc
b/src/lib/matcher.cc
index 3a513b24ea7c8224e6fe04ae51dd6d7f5019069b..48f6ed9126dd980c13b79b6665a3a82ad203bf9b 100644
(file)
--- a/
src/lib/matcher.cc
+++ b/
src/lib/matcher.cc
@@
-26,8
+26,8
@@
using std::min;
using boost::shared_ptr;
using std::min;
using boost::shared_ptr;
-Matcher::Matcher (
Log*
log, int sample_rate, float frames_per_second)
- : Processor (log)
+Matcher::Matcher (
shared_ptr<Log>
log, int sample_rate, float frames_per_second)
+ :
AudioVideo
Processor (log)
, _sample_rate (sample_rate)
, _frames_per_second (frames_per_second)
, _video_frames (0)
, _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
}
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++;
{
Video (i, same, s);
_video_frames++;
@@
-47,7
+47,7
@@
Matcher::process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr
}
void
}
void
-Matcher::process_audio (boost::shared_ptr<AudioBuffers> b
, double
)
+Matcher::process_audio (boost::shared_ptr<AudioBuffers> b)
{
Audio (b);
_audio_frames += b->frames ();
{
Audio (b);
_audio_frames += b->frames ();