From: Carl Hetherington <cth@carlh.net>
Date: Thu, 8 Sep 2016 23:16:46 +0000 (+0100)
Subject: Write a 7.1 channel assignment into SMPTE DCP audio MXFs.
X-Git-Tag: v2.9.21~7
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d1108717fd7ba97a0d699331bddbef98bddfc53c

Write a 7.1 channel assignment into SMPTE DCP audio MXFs.
---

diff --git a/cscript b/cscript
index 87cfcfe52..566381904 100644
--- a/cscript
+++ b/cscript
@@ -233,7 +233,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', '04a3cc5'),
+            ('libdcp', 'fe83eb5'),
             ('libsub', '067c21c'))
 
 def configure_options(target):
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index d742818ae..1f9885e64 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -119,7 +119,11 @@ ReelWriter::ReelWriter (
 		*/
 		_sound_asset_writer = _sound_asset->start_write (
 			_film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
-			_film->interop() ? dcp::INTEROP : dcp::SMPTE
+			_film->interop() ? dcp::INTEROP : dcp::SMPTE,
+			/* XXX: this could well be wrong, but it's better than nothing; the whole channel assignment
+			   thing needs fixing.
+			*/
+			dcp::CHANNEL_ASSIGNMENT_71
 			);
 	}
 }