diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-24 12:19:50 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-24 12:19:50 +0000 |
| commit | 85c65bd422742813992686c17a5e1b718cc3c449 (patch) | |
| tree | 21750399bcb19e1fb6242bba7595773513a80912 /src/wx/audio_mapping_view.cc | |
| parent | e2be8234013335379bd49a53854218039348c7a4 (diff) | |
| parent | eed40e4e5ca46bbc31a9833d2b766c96c11b0254 (diff) | |
Merge master; specify libdcp-1.0.
Diffstat (limited to 'src/wx/audio_mapping_view.cc')
| -rw-r--r-- | src/wx/audio_mapping_view.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 75c8ea5de..86f039900 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -271,6 +271,10 @@ AudioMappingView::set_column_labels () int const c = _grid->GetNumberCols (); _grid->SetColLabelValue (0, _("Content channel")); + +#if MAX_AUDIO_CHANNELS != 8 +#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_AUDIO_CHANNELS +#endif if (c > 0) { _grid->SetColLabelValue (1, _("L")); @@ -296,6 +300,14 @@ AudioMappingView::set_column_labels () _grid->SetColLabelValue (6, _("Rs")); } + if (c > 6) { + _grid->SetColLabelValue (7, _("HI")); + } + + if (c > 7) { + _grid->SetColLabelValue (8, _("VI")); + } + _grid->AutoSize (); } |