From: Carl Hetherington <cth@carlh.net>
Date: Sun, 28 May 2023 21:35:25 +0000 (+0200)
Subject: Report the number of active channels in DCPs, not the number in the MXF.
X-Git-Tag: v2.16.57~4
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=78b2c650a9249cb7165d269b4378391d31e68e8b

Report the number of active channels in DCPs, not the number in the MXF.
---

diff --git a/cscript b/cscript
index c0346cc7d..afbfce0fc 100644
--- a/cscript
+++ b/cscript
@@ -480,7 +480,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.70'))
+    deps.append(('libdcp', 'v1.8.72'))
     deps.append(('libsub', 'v1.6.44'))
     deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae'))
     deps.append(('rtaudio', 'f619b76'))
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 9c4f899c6..50b19e2fd 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -175,8 +175,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
 			auto asset = reel->main_sound()->asset();
 
 			if (!_audio_channels) {
-				_audio_channels = asset->channels ();
-			} else if (_audio_channels.get() != asset->channels ()) {
+				_audio_channels = asset->active_channels();
+			} else if (_audio_channels.get() != asset->active_channels()) {
 				throw DCPError (_("Mismatched audio channel counts in DCP"));
 			}