projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Numerous fixes to A/B mode so that at least it doesn't crash (#72).
[dcpomatic.git]
/
src
/
lib
/
matcher.cc
diff --git
a/src/lib/matcher.cc
b/src/lib/matcher.cc
index 182fb306c695d1008b4b8be8d50732af4cddda55..48f6ed9126dd980c13b79b6665a3a82ad203bf9b 100644
(file)
--- a/
src/lib/matcher.cc
+++ b/
src/lib/matcher.cc
@@
-21,10
+21,12
@@
#include "image.h"
#include "log.h"
#include "image.h"
#include "log.h"
+#include "i18n.h"
+
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)
+Matcher::Matcher (
shared_ptr<Log>
log, int sample_rate, float frames_per_second)
: AudioVideoProcessor (log)
, _sample_rate (sample_rate)
, _frames_per_second (frames_per_second)
: AudioVideoProcessor (log)
, _sample_rate (sample_rate)
, _frames_per_second (frames_per_second)
@@
-65,7
+67,7
@@
Matcher::process_end ()
_log->log (
String::compose (
_log->log (
String::compose (
-
"Matching processor has seen %1 video frames (which equals %2 audio frames) and %3 audio frames"
,
+
N_("Matching processor has seen %1 video frames (which equals %2 audio frames) and %3 audio frames")
,
_video_frames,
video_frames_to_audio_frames (_video_frames, _sample_rate, _frames_per_second),
_audio_frames
_video_frames,
video_frames_to_audio_frames (_video_frames, _sample_rate, _frames_per_second),
_audio_frames
@@
-74,12
+76,12
@@
Matcher::process_end ()
if (audio_short_by_frames < 0) {
if (audio_short_by_frames < 0) {
- _log->log (String::compose (
"%1 too many audio frames"
, -audio_short_by_frames));
+ _log->log (String::compose (
N_("%1 too many audio frames")
, -audio_short_by_frames));
/* We have seen more audio than video. Emit enough black video frames so that we reverse this */
int const black_video_frames = ceil (-audio_short_by_frames * _frames_per_second / _sample_rate);
/* We have seen more audio than video. Emit enough black video frames so that we reverse this */
int const black_video_frames = ceil (-audio_short_by_frames * _frames_per_second / _sample_rate);
- _log->log (String::compose (
"Emitting %1 frames of black video"
, black_video_frames));
+ _log->log (String::compose (
N_("Emitting %1 frames of black video")
, black_video_frames));
shared_ptr<Image> black (new SimpleImage (_pixel_format.get(), _size.get(), true));
black->make_black ();
shared_ptr<Image> black (new SimpleImage (_pixel_format.get(), _size.get(), true));
black->make_black ();
@@
-92,7
+94,7
@@
Matcher::process_end ()
}
if (audio_short_by_frames > 0) {
}
if (audio_short_by_frames > 0) {
- _log->log (String::compose (
"Emitted %1 too few audio frames"
, audio_short_by_frames));
+ _log->log (String::compose (
N_("Emitted %1 too few audio frames")
, audio_short_by_frames));
/* Do things in half second blocks as I think there may be limits
to what FFmpeg (and in particular the resampler) can cope with.
/* Do things in half second blocks as I think there may be limits
to what FFmpeg (and in particular the resampler) can cope with.