X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=347cc0a0fb362f95b55686ad3fb76744e746ff8f;hb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;hp=9a911669095bdfba9cbb3f31262c7d01f733b6cf;hpb=91273da19c689e44f3baa368d4b4efbe75cd8fe5;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 9a9116690..347cc0a0f 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -18,6 +18,7 @@
 */
 
 #include "audio_analysis.h"
+#include "audio_buffers.h"
 #include "analyse_audio_job.h"
 #include "compose.hpp"
 #include "film.h"
@@ -45,12 +46,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->file().filename());
+	return _("Analyse audio");
 }
 
 void
@@ -64,18 +60,18 @@ AnalyseAudioJob::run ()
 	shared_ptr<Playlist> playlist (new Playlist);
 	playlist->add (content);
 	shared_ptr<Player> player (new Player (_film, playlist));
-	player->disable_video ();
 	
-	player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1, _2));
-
-	_samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length_without_loop()) / _num_points);
+	int64_t const len = _film->length().frames (_film->audio_frame_rate());
+	_samples_per_point = max (int64_t (1), len / _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;
-	while (!player->pass ()) {
-		set_progress (double (_film->audio_frames_to_time (_done)) / _film->length_without_loop ());
+	DCPTime const block = DCPTime::from_seconds (1.0 / 8);
+	for (DCPTime t; t < _film->length(); t += block) {
+		analyse (player->get_audio (t, block, false));
+		set_progress (t.seconds() / _film->length().seconds());
 	}
 
 	_analysis->write (content->audio_analysis_path ());
@@ -85,7 +81,7 @@ AnalyseAudioJob::run ()
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b, Time)
+AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
 {
 	for (int i = 0; i < b->frames(); ++i) {
 		for (int j = 0; j < b->channels(); ++j) {