Merge master.

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

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index f6d747b9b49e6add9027c23360e9307818ffd386..969397b0bdf9a1a43f696cfc9d4b22ac04e125ef 100644 (file)
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -28,6 +28,7 @@ using std::cout;
 using std::make_pair;
 using std::pair;
 using std::string;
+using std::min;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::dynamic_pointer_cast;
@@ -53,7 +54,7 @@ AudioMapping::setup (int c)
        
        _gain.resize (_content_channels);
        for (int i = 0; i < _content_channels; ++i) {
-               _gain[i].resize (MAX_AUDIO_CHANNELS);
+               _gain[i].resize (MAX_DCP_AUDIO_CHANNELS);
        }
 }
 
@@ -61,7 +62,7 @@ void
 AudioMapping::make_default ()
 {
        for (int i = 0; i < _content_channels; ++i) {
-               for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) {
+               for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
                        _gain[i][j] = 0;
                }
        }
@@ -71,7 +72,7 @@ AudioMapping::make_default ()
                set (0, dcp::CENTRE, 1);
        } else {
                /* 1:1 mapping */
-               for (int i = 0; i < _content_channels; ++i) {
+               for (int i = 0; i < min (_content_channels, MAX_DCP_AUDIO_CHANNELS); ++i) {
                        set (i, static_cast<dcp::Channel> (i), 1);
                }
        }
@@ -117,7 +118,7 @@ AudioMapping::as_xml (xmlpp::Node* node) const
        node->add_child ("ContentChannels")->add_child_text (lexical_cast<string> (_content_channels));
 
        for (int c = 0; c < _content_channels; ++c) {
-               for (int d = 0; d < MAX_AUDIO_CHANNELS; ++d) {
+               for (int d = 0; d < MAX_DCP_AUDIO_CHANNELS; ++d) {
                        xmlpp::Element* t = node->add_child ("Gain");
                        t->set_attribute ("Content", lexical_cast<string> (c));
                        t->set_attribute ("DCP", lexical_cast<string> (d));