Go back to respecting the user's choice for the number of audio channels in the MXF.

[dcpomatic.git] / src / lib / writer.cc

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 71e9d579dacbc91d078665cbdc7922e9f552993f..8b8ab89deb9540bb72453dcfc3d072ab85d2273b 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -653,9 +653,12 @@ Writer::finish (boost::filesystem::path output_dcp)
                field = dcp::MCASoundField::FIVE_POINT_ONE;
        }
 
-       dcp::MainSoundConfiguration msc(field, MAX_DCP_AUDIO_CHANNELS);
+       auto const audio_channels = film()->audio_channels();
+       dcp::MainSoundConfiguration msc(field, audio_channels);
        for (auto i: film()->mapped_audio_channels()) {
-               msc.set_mapping(i, static_cast<dcp::Channel>(i));
+               if (i < audio_channels) {
+                       msc.set_mapping(i, static_cast<dcp::Channel>(i));
+               }
        }
 
        cpl->set_main_sound_configuration(msc);