X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=9d0882b3ad22b3061f243d53ae78f91146042d3d;hb=64a5419b16d676d48f36b4699cfe83a91ec78549;hp=db917301aaac01d9f37a111f1126f6998f862e50;hpb=f0192490565c72aa9838f40cbab56c4c0c60e522;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index db917301a..9d0882b3a 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -47,6 +47,7 @@ using std::min;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
@@ -54,6 +55,7 @@ int const AnalyseAudioJob::_num_points = 1024;
 AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist, bool from_zero)
 	: Job (film)
 	, _playlist (playlist)
+	, _path (film->audio_analysis_path(playlist))
 	, _from_zero (from_zero)
 	, _done (0)
 	, _samples_per_point (1)
@@ -92,7 +94,7 @@ AnalyseAudioJob::~AnalyseAudioJob ()
 string
 AnalyseAudioJob::name () const
 {
-	return _("Analyse audio");
+	return _("Analysing audio");
 }
 
 string
@@ -106,12 +108,12 @@ AnalyseAudioJob::run ()
 {
 	shared_ptr<Player> player (new Player (_film, _playlist));
 	player->set_ignore_video ();
-	player->set_ignore_subtitle ();
+	player->set_ignore_text ();
 	player->set_fast ();
 	player->set_play_referenced ();
 	player->Audio.connect (bind (&AnalyseAudioJob::analyse, this, _1, _2));
 
-	DCPTime const length = _playlist->length ();
+	DCPTime const length = _playlist->length (_film);
 
 	Frame const len = DCPTime (length - _start).frames_round (_film->audio_frame_rate());
 	_samples_per_point = max (int64_t (1), len / _num_points);
@@ -159,13 +161,14 @@ AnalyseAudioJob::run ()
 		   gain was when we analysed it.
 		*/
 		shared_ptr<const AudioContent> ac = _playlist->content().front()->audio;
-		DCPOMATIC_ASSERT (ac);
-		_analysis->set_analysis_gain (ac->gain ());
+		if (ac) {
+			_analysis->set_analysis_gain (ac->gain());
+		}
 	}
 
 	_analysis->set_samples_per_point (_samples_per_point);
 	_analysis->set_sample_rate (_film->audio_frame_rate ());
-	_analysis->write (_film->audio_analysis_path (_playlist));
+	_analysis->write (_path);
 
 	set_progress (1);
 	set_state (FINISHED_OK);
@@ -213,6 +216,6 @@ AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b, DCPTime time)
 
 	_done += frames;
 
-	DCPTime const length = _playlist->length ();
+	DCPTime const length = _playlist->length (_film);
 	set_progress ((time.seconds() - _start.seconds()) / (length.seconds() - _start.seconds()));
 }