MAX_AUDIO_CHANNELS -> MAX_DCP_AUDIO_CHANNELS.

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index ae7702998498902717b43df546c069a3e07475e3..28a0fc3801f5231e75eeeb66d5495c9c422aee02 100644 (file)
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -53,7 +53,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 +61,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;
                }
        }
@@ -117,7 +117,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));

diff --git a/src/lib/util.cc b/src/lib/util.cc
index f15d2283c4cfb2d1bbb1066d582a38c36b2a5511..62416163bc4aa080ef58cb0acab6d954dd34d0df 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -790,7 +790,7 @@ video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, fl
 string
 audio_channel_name (int c)
 {
-       assert (MAX_AUDIO_CHANNELS == 12);
+       assert (MAX_DCP_AUDIO_CHANNELS == 12);
 
        /* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
           enhancement channel (sub-woofer).  HI is the hearing-impaired audio track and

diff --git a/src/lib/util.h b/src/lib/util.h
index 0bbab83058644a1e833f60834672a52db90d933f..473c902395529ebaa8c3878ddbc67419717d7166 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -48,8 +48,8 @@ extern "C" {
 
 #undef check
 
-/** The maximum number of audio channels that we can cope with */
-#define MAX_AUDIO_CHANNELS 12
+/** The maximum number of audio channels that we can have in a DCP */
+#define MAX_DCP_AUDIO_CHANNELS 12
 
 #define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
 

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 1bce22811c6b7c48e6543445e1ad53414da6509e..0e1316cf31979f21d3ec4790f1a3ba5bb7154461 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -45,7 +45,7 @@ AudioDialog::AudioDialog (wxWindow* parent)
                side->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
        }
 
-       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+       for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
                _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i)));
                side->Add (_channel_checkbox[i], 1, wxEXPAND | wxALL, 3);
                _channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1));
@@ -144,11 +144,11 @@ void
 AudioDialog::channel_clicked (wxCommandEvent& ev)
 {
        int c = 0;
-       while (c < MAX_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) {
+       while (c < MAX_DCP_AUDIO_CHANNELS && ev.GetEventObject() != _channel_checkbox[c]) {
                ++c;
        }
 
-       assert (c < MAX_AUDIO_CHANNELS);
+       assert (c < MAX_DCP_AUDIO_CHANNELS);
 
        _plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index b4257057dd6c4a2741301510fa478ddd85911992..b277852928d19f53e3849464a0541d24c65288c3 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -43,7 +43,7 @@ private:
 
        boost::shared_ptr<AudioContent> _content;
        AudioPlot* _plot;
-       wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
+       wxCheckBox* _channel_checkbox[MAX_DCP_AUDIO_CHANNELS];
        wxCheckBox* _type_checkbox[AudioPoint::COUNT];
        wxSlider* _smoothing;
        boost::signals2::scoped_connection _content_changed_connection;

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 7fdecb8d52a8dc9d3cee8ff54e8781b68b3ca422..39bc0825b9c7245ad184190fa9e1fc7c1eb9fe37 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -111,7 +111,7 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
 {
        _grid = new wxGrid (this, wxID_ANY);
 
-       _grid->CreateGrid (0, MAX_AUDIO_CHANNELS + 1);
+       _grid->CreateGrid (0, MAX_DCP_AUDIO_CHANNELS + 1);
        _grid->HideRowLabels ();
        _grid->DisableDragRowSize ();
        _grid->DisableDragColSize ();
@@ -233,7 +233,7 @@ AudioMappingView::update_cells ()
        _grid->InsertRows (0, _map.content_channels ());
 
        for (int i = 0; i < _map.content_channels(); ++i) {
-               for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) {
+               for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
                        _grid->SetCellRenderer (i, j + 1, new ValueRenderer);
                }
        }
@@ -272,8 +272,8 @@ AudioMappingView::set_column_labels ()
        
        _grid->SetColLabelValue (0, _("Content"));
 
-#if MAX_AUDIO_CHANNELS != 12
-#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_AUDIO_CHANNELS
+#if MAX_DCP_AUDIO_CHANNELS != 12
+#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_DCP_AUDIO_CHANNELS
 #endif 
        
        if (c > 0) {

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 124b927367da0a69773a3e2d05171e176fa186ee..69faf127e2db0404fa5192cf9f12d8a74510ec5b 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -46,7 +46,7 @@ AudioPlot::AudioPlot (wxWindow* parent)
        SetDoubleBuffered (true);
 #endif 
 
-       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+       for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
                _channel_visible[i] = false;
        }
 
@@ -67,8 +67,8 @@ AudioPlot::AudioPlot (wxWindow* parent)
        _colours.push_back (wxColour (255,   0, 139));
        _colours.push_back (wxColour (139,   0, 255));
 
-#if MAX_AUDIO_CHANNELS != 12
-#warning AudioPlot::AudioPlot is expecting the wrong MAX_AUDIO_CHANNELS
+#if MAX_DCP_AUDIO_CHANNELS != 12
+#warning AudioPlot::AudioPlot is expecting the wrong MAX_DCP_AUDIO_CHANNELS
 #endif 
        
        Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this));
@@ -81,7 +81,7 @@ AudioPlot::set_analysis (shared_ptr<AudioAnalysis> a)
 {
        _analysis = a;
 
-       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+       for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
                _channel_visible[i] = false;
        }
 
@@ -168,7 +168,7 @@ AudioPlot::paint ()
        gc->DrawText (_("Time"), data_width, metrics.height - metrics.y_origin + db_label_height / 2);
        
        if (_type_visible[AudioPoint::PEAK]) {
-               for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
+               for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) {
                        wxGraphicsPath p = gc->CreatePath ();
                        if (_channel_visible[c] && c < _analysis->channels()) {
                                plot_peak (p, c, metrics);
@@ -180,7 +180,7 @@ AudioPlot::paint ()
        }
 
        if (_type_visible[AudioPoint::RMS]) {
-               for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {
+               for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) {
                        wxGraphicsPath p = gc->CreatePath ();
                        if (_channel_visible[c] && c < _analysis->channels()) {
                                plot_rms (p, c, metrics);

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 4a1a40aa138ad709d54bfca4cf9ac8c4600ef480..adf11e633030262a62dfa4802f3c3cc5e7bcaf6d 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -46,7 +46,7 @@ private:
        float y_for_linear (float, Metrics const &) const;
 
        boost::shared_ptr<AudioAnalysis> _analysis;
-       bool _channel_visible[MAX_AUDIO_CHANNELS];
+       bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
        bool _type_visible[AudioPoint::COUNT];
        /** gain to apply in dB */
        float _gain;

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 1131675bc10319216f07ca5a7ed8d549eb84d15b..17198e8b330a113426677d56b191a0756294e533 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -214,7 +214,7 @@ FilmEditor::make_dcp_panel ()
                _frame_rate->Append (std_to_wx (boost::lexical_cast<string> (*i)));
        }
 
-       _audio_channels->SetRange (0, MAX_AUDIO_CHANNELS);
+       _audio_channels->SetRange (0, MAX_DCP_AUDIO_CHANNELS);
        _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
 
        _resolution->Append (_("2K"));

diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc
index a2a74104b513820e367b43d67d2609beb099c324..bfb53b0871193c681c333497b3343403d5d1e761 100644 (file)
--- a/test/audio_mapping_test.cc
+++ b/test/audio_mapping_test.cc
@@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE (audio_mapping_test)
        four.make_default ();
 
        for (int i = 0; i < 4; ++i) {
-               for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) {
+               for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
                        BOOST_CHECK_EQUAL (four.get (i, static_cast<libdcp::Channel> (j)), i == j ? 1 : 0);
                }
        }

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 82cbad080d9b8eafebf06f0effea0d4efaa12dc9..d5236c144486f125a57ed300bb063c02dea84175 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -115,7 +115,7 @@ static void test_silence_padding (int channels)
 
 BOOST_AUTO_TEST_CASE (silence_padding_test)
 {
-       for (int i = 1; i < MAX_AUDIO_CHANNELS; ++i) {
+       for (int i = 1; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
                test_silence_padding (i);
        }
 }