diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-10 14:13:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-10 14:13:10 +0100 |
| commit | cfdd68eb5fb0ef8423e860103ad4e5510994f1da (patch) | |
| tree | 9ea43b250723775329741e59d5bc2dd861bcb7be /src/wx/audio_mapping_view.cc | |
| parent | 1dcfb3a26085ebb3703f40e2f51e43ce3d98be50 (diff) | |
| parent | 5575a950f13dbed1e60d733aee71b316c3429ae0 (diff) | |
Merge master.
Diffstat (limited to 'src/wx/audio_mapping_view.cc')
| -rw-r--r-- | src/wx/audio_mapping_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index be1bd67b9..937501086 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -118,7 +118,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 (); @@ -240,7 +240,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); } } @@ -279,8 +279,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) { |