Merge master.

[dcpomatic.git] / src / lib / analyse_audio_job.cc

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index fb5f2868f33e9f82a79c595afdca736a33cc23f9..ca316f70ebe80d2ce4ccc2734dbd9f99459cb570 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -25,12 +25,14 @@
 #include "decoder_factory.h"
 #include "audio_decoder.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::max;
 using std::cout;
 using boost::shared_ptr;
 
-int const AnalyseAudioJob::_num_points = 128;
+int const AnalyseAudioJob::_num_points = 1024;
 
 AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
        : Job (f)
@@ -43,7 +45,7 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
 string
 AnalyseAudioJob::name () const
 {
-       return String::compose ("Analyse audio of %1", _film->name());
+       return String::compose (_("Analyse audio of %1"), _film->name());
 }
 
 void
@@ -95,8 +97,7 @@ AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
                        _current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], fabsf (s));
 
                        if ((_done % _samples_per_point) == 0) {
-                               _current[j][AudioPoint::RMS] = 20 * log10 (sqrt (_current[j][AudioPoint::RMS] / _samples_per_point));
-                               _current[j][AudioPoint::PEAK] = 20 * log10 (_current[j][AudioPoint::PEAK]);
+                               _current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point);
                                _analysis->add_point (j, _current[j]);
                                
                                _current[j] = AudioPoint ();