diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-05 16:20:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-05 16:20:23 +0000 |
| commit | 79ce26d031d109177ba4b0f637fa2960345a37a3 (patch) | |
| tree | 987dbb3419f779fbd8192795898f3f93d0291efe /src/wx/audio_mapping_view.cc | |
| parent | a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1 (diff) | |
| parent | a476ad31d447b8436326ba1bf448471f321a3ca9 (diff) | |
Merge branch 'master' into 2.0
Diffstat (limited to 'src/wx/audio_mapping_view.cc')
| -rw-r--r-- | src/wx/audio_mapping_view.cc | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 0b28b12fb..52303ac14 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -34,7 +34,7 @@ using std::max; using boost::shared_ptr; using boost::lexical_cast; -#define INDICATOR_SIZE 20 +#define INDICATOR_SIZE 16 enum { ID_off = 1, @@ -270,9 +270,9 @@ AudioMappingView::set_column_labels () { int const c = _grid->GetNumberCols (); - _grid->SetColLabelValue (0, _("Content channel")); + _grid->SetColLabelValue (0, _("Content")); -#if MAX_AUDIO_CHANNELS != 8 +#if MAX_AUDIO_CHANNELS != 12 #warning AudioMappingView::set_column_labels() is expecting the wrong MAX_AUDIO_CHANNELS #endif @@ -307,7 +307,23 @@ AudioMappingView::set_column_labels () if (c > 7) { _grid->SetColLabelValue (8, _("VI")); } - + + if (c > 8) { + _grid->SetColLabelValue (9, _("Lc")); + } + + if (c > 9) { + _grid->SetColLabelValue (10, _("Rc")); + } + + if (c > 10) { + _grid->SetColLabelValue (11, _("BsL")); + } + + if (c > 11) { + _grid->SetColLabelValue (12, _("BsR")); + } + _grid->AutoSize (); } |