X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=872947b55d3d56cac4a957ca561bc5944a81d34c;hb=d7b23d44dec9d6357619e8e009e564e475215470;hp=df67b37d6144ea48740bd9fe2275de9d3b380072;hpb=49a51ff9778f3b72ee962d3e8bd9cf71944f3c2b;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index df67b37d6..872947b55 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -45,12 +45,7 @@ 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->path());
+	return _("Analyse audio");
 }
 
 void
@@ -74,8 +69,9 @@ AnalyseAudioJob::run ()
 	_analysis.reset (new AudioAnalysis (_film->audio_channels ()));
 
 	_done = 0;
+	AudioFrame 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 ());
@@ -85,7 +81,7 @@ AnalyseAudioJob::run ()
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b, Time)
+AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b, DCPTime)
 {
 	for (int i = 0; i < b->frames(); ++i) {
 		for (int j = 0; j < b->channels(); ++j) {