X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=8800e2657784d4e0516c8f77141335bd2e36a2ee;hb=c13757391e75cdde7a9cef947c921b7a9ad08003;hp=cdf6238767e21bc7ba0931a04edaf52d75de1277;hpb=fc96a4b3d6985f28db6bc0e9418e98cc5bec87e3;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index cdf623876..8800e2657 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -23,6 +23,7 @@
 #include "compose.hpp"
 #include "film.h"
 #include "player.h"
+#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
@@ -31,12 +32,13 @@ using std::max;
 using std::min;
 using std::cout;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<AudioContent> c)
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	: Job (f)
-	, _content (c)
+	, _playlist (p)
 	, _done (0)
 	, _samples_per_point (1)
 	, _overall_peak (0)
@@ -60,14 +62,7 @@ AnalyseAudioJob::json_name () const
 void
 AnalyseAudioJob::run ()
 {
-	shared_ptr<AudioContent> content = _content.lock ();
-	if (!content) {
-		return;
-	}
-
-	shared_ptr<Playlist> playlist (new Playlist);
-	playlist->add (content);
-	shared_ptr<Player> player (new Player (_film, playlist));
+	shared_ptr<Player> player (new Player (_film));
 	player->set_ignore_video ();
 	
 	int64_t const len = _film->length().frames (_film->audio_frame_rate());
@@ -76,15 +71,24 @@ AnalyseAudioJob::run ()
 	_current.resize (_film->audio_channels ());
 	_analysis.reset (new AudioAnalysis (_film->audio_channels ()));
 
-	_done = 0;
-	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());
+	bool has_any_audio = false;
+	BOOST_FOREACH (shared_ptr<Content> c, _film->content ()) {
+		if (dynamic_pointer_cast<AudioContent> (c)) {
+			has_any_audio = true;
+		}
+	}
+
+	if (has_any_audio) {
+		_done = 0;
+		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->set_peak (_overall_peak, DCPTime::from_frames (_overall_peak_frame, _film->audio_frame_rate ()));
-	_analysis->write (content->audio_analysis_path ());
+	_analysis->write (_film->audio_analysis_path (_playlist));
 	
 	set_progress (1);
 	set_state (FINISHED_OK);