Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

[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 2848c1ed773c16dfe5b6acbf0b3c0f6b61f65aac..bfe0ed61f281816a71e20b66f17c18e429d46ac9 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -45,12 +45,13 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<AudioCont
 string
 AnalyseAudioJob::name () const
 {
-       shared_ptr<AudioContent> content = _content.lock ();
-       if (!content) {
-               return "";
-       }
-       
-       return String::compose (_("Analyse audio of %1"), content->file().filename());
+       return _("Analyse audio");
+}
+
+string
+AnalyseAudioJob::json_name () const
+{
+       return N_("analyse_audio");
 }
 
 void
@@ -70,12 +71,13 @@ AnalyseAudioJob::run ()
 
        _samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length()) / _num_points);
 
-       _current.resize (_film->dcp_audio_channels ());
-       _analysis.reset (new AudioAnalysis (_film->dcp_audio_channels ()));
+       _current.resize (_film->audio_channels ());
+       _analysis.reset (new AudioAnalysis (_film->audio_channels ()));
 
        _done = 0;
+       OutputAudioFrame const len = _film->time_to_audio_frames (_film->length ());
        while (!player->pass ()) {
-               set_progress (double (_film->audio_frames_to_time (_done)) / _film->length ());
+               set_progress (double (_done) / len);
        }
 
        _analysis->write (content->audio_analysis_path ());