Merge branch 'master' into plot-audio

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 8a09f254b775716a8cbdb01886b42a0ec5fb2aff..1dad4357d9381f02f5a9b9e3382c22c0a6a71153 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -72,13 +72,15 @@ Writer::Writer (shared_ptr<Film> f)
 
        _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-       if (_film->audio_channels() > 0) {
+       AudioMapping m (_film->audio_channels ());
+       
+       if (m.dcp_channels() > 0) {
                _sound_asset.reset (
                        new libdcp::SoundAsset (
                                _film->dir (_film->dcp_name()),
                                "audio.mxf",
                                DCPFrameRate (_film->frames_per_second()).frames_per_second,
-                               _film->audio_channels(),
+                               m.dcp_channels (),
                                dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
                                )
                        );