X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=f3c55b208db152bd866eed8a44f550ff2c20c957;hb=f861018389acd9d277fe34d7621182b9b54f977f;hp=43eecbcbd774f66d4b84e70e714171aa86304aa2;hpb=ffd67de21310dfaca4b379c2a9869ea6ce946fd6;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 43eecbcbd..f3c55b208 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -21,9 +21,7 @@
 #include "analyse_audio_job.h"
 #include "compose.hpp"
 #include "film.h"
-#include "options.h"
-#include "decoder_factory.h"
-#include "audio_decoder.h"
+#include "player.h"
 
 #include "i18n.h"
 
@@ -52,29 +50,18 @@ AnalyseAudioJob::name () const
 void
 AnalyseAudioJob::run ()
 {
-	if (!_film->audio_stream () || !_film->length()) {
-		set_progress (1);
-		set_state (FINISHED_ERROR);
-		return;
-	}
-		
-	DecodeOptions options;
-	options.decode_video = false;
-
-	Decoders decoders = decoder_factory (_film, options);
-	assert (decoders.audio);
+	shared_ptr<Player> player = _film->player ();
+	player->disable_video ();
 	
-	decoders.audio->set_audio_stream (_film->audio_stream ());
-	decoders.audio->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
+	player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
 
-	int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->source_frame_rate());
-	_samples_per_point = max (int64_t (1), total_audio_frames / _num_points);
+	_samples_per_point = max (int64_t (1), _film->audio_length() / _num_points);
 
-	_current.resize (_film->audio_stream()->channels ());
-	_analysis.reset (new AudioAnalysis (_film->audio_stream()->channels()));
+	_current.resize (MAX_AUDIO_CHANNELS);
+	_analysis.reset (new AudioAnalysis (MAX_AUDIO_CHANNELS));
 			 
-	while (!decoders.audio->pass()) {
-		set_progress (float (_done) / total_audio_frames);
+	while (!player->pass()) {
+		set_progress (float (_done) / _film->audio_length ());
 	}
 
 	_analysis->write (_film->audio_analysis_path ());
@@ -84,7 +71,7 @@ AnalyseAudioJob::run ()
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
+AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b)
 {
 	for (int i = 0; i < b->frames(); ++i) {
 		for (int j = 0; j < b->channels(); ++j) {