Write a 7.1 channel assignment into SMPTE DCP audio MXFs.

diff --git a/cscript b/cscript
index 87cfcfe52beb389f51189705c7c12b514a78b2d3..566381904927be3ee29d636d1c9cdf5c148640d6 100644 (file)
--- a/cscript
+++ b/cscript
@@ -233,7 +233,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),

-            ('libdcp', '04a3cc5'),
+            ('libdcp', 'fe83eb5'),

             ('libsub', '067c21c'))
 
 def configure_options(target):
             ('libsub', '067c21c'))
 
 def configure_options(target):

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index d742818ae08849bfe81e191c3f922deb01a3b6c0..1f9885e646b99cbc4a94f2e17ba220182cfc0091 100644 (file)
--- 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),
                */
                _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

                        );
        }
 }
                        );
        }
 }