diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-05 14:43:12 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-05 14:43:12 +0000 |
| commit | bbd5444a9eb98b52136327dad0744b4c62a88ab2 (patch) | |
| tree | 77e0984bccce32a36746dd0d342937565b3d2376 /src/wx | |
| parent | e60d56f2e25140a6c477b9c84595e7a8bad4d1e5 (diff) | |
Bump maximum audio channels to 12 so that we can (crudely) use
BsL/BsR.
Requested-by: Markus Raab
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/audio_mapping_view.cc | 24 | ||||
| -rw-r--r-- | src/wx/audio_plot.cc | 6 |
2 files changed, 25 insertions, 5 deletions
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index fe3219261..7fdecb8d5 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 (); } diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 2e8b24e36..124b92736 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -62,8 +62,12 @@ AudioPlot::AudioPlot (wxWindow* parent) _colours.push_back (wxColour ( 0, 139, 0)); _colours.push_back (wxColour ( 0, 0, 139)); _colours.push_back (wxColour (255, 255, 0)); + _colours.push_back (wxColour ( 0, 255, 255)); + _colours.push_back (wxColour (255, 0, 255)); + _colours.push_back (wxColour (255, 0, 139)); + _colours.push_back (wxColour (139, 0, 255)); -#if MAX_AUDIO_CHANNELS != 8 +#if MAX_AUDIO_CHANNELS != 12 #warning AudioPlot::AudioPlot is expecting the wrong MAX_AUDIO_CHANNELS #endif |