From: Carl Hetherington <cth@carlh.net>
Date: Wed, 23 Sep 2020 18:16:12 +0000 (+0200)
Subject: Fix crash now that some audio channels are definitely unused.
X-Git-Tag: v2.15.103~6
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5932cc8c99ff9704deab0eb309101ed00c4f570d

Fix crash now that some audio channels are definitely unused.
---

diff --git a/cscript b/cscript
index 2f699d908..ed8e84d58 100644
--- a/cscript
+++ b/cscript
@@ -375,8 +375,8 @@ def dependencies(target, options):
             (target.platform == 'osx' and target.bits == 64) or
             (target.platform == 'windows')) else {}
 
-    deps.append(('libdcp', 'e40f5c5', cpp_lib_options))
-    deps.append(('libsub', '4bc0e7e', cpp_lib_options))
+    deps.append(('libdcp', '38864bb', cpp_lib_options))
+    deps.append(('libsub', '308476c', cpp_lib_options))
     deps.append(('leqm-nrt', 'carl'))
     deps.append(('rtaudio', 'carl'))
     # We get our OpenSSL libraries from the environment, but we
diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index 94efbe49b..40dc4ebfa 100644
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -237,7 +237,7 @@ AudioMapping::mapped_output_channels () const
 	list<int> mapped;
 
 	for (vector<vector<float> >::const_iterator i = _gain.begin(); i != _gain.end(); ++i) {
-		for (size_t j = 0; j < i->size(); ++j) {
+		BOOST_FOREACH (dcp::Channel j, dcp::used_audio_channels()) {
 			if (abs ((*i)[j]) > minus_96_db) {
 				mapped.push_back (j);
 			}