From: Carl Hetherington <cth@carlh.net>
Date: Fri, 21 May 2021 07:44:51 +0000 (+0200)
Subject: Fix thinko in 4ce4b8d3429a97eb4df63460c7e73863f44a621e
X-Git-Tag: v2.15.150~1
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d652b6dbc655eaa56000620ef55f96badbaa89ff

Fix thinko in 4ce4b8d3429a97eb4df63460c7e73863f44a621e

Audio content of course doesn't have a single selected stream, so
let's get the channel count from how all the streams are mapped.
---

diff --git a/src/lib/audio_analyser.cc b/src/lib/audio_analyser.cc
index 64d200c76..d5095c7e6 100644
--- a/src/lib/audio_analyser.cc
+++ b/src/lib/audio_analyser.cc
@@ -89,8 +89,8 @@ AudioAnalyser::AudioAnalyser (shared_ptr<const Film> film, shared_ptr<const Play
 
 	int leqm_channels = film->audio_channels();
 	auto content = _playlist->content();
-	if (content.size() == 1 && content[0]->audio && content[0]->audio->stream()) {
-		leqm_channels = content[0]->audio->stream()->channels();
+	if (content.size() == 1 && content[0]->audio) {
+		leqm_channels = content[0]->audio->mapping().mapped_output_channels().size();
 	}
 
 	/* XXX: is this right?  Especially for more than 5.1? */