projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; specify libdcp-1.0.
[dcpomatic.git]
/
src
/
wx
/
audio_mapping_view.cc
diff --git
a/src/wx/audio_mapping_view.cc
b/src/wx/audio_mapping_view.cc
index 75c8ea5de0fcf2d78b5a9be421019badc69809bb..86f0399003787643955d7f66cf5df7ec9acb1f9c 100644
(file)
--- 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"));
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"));
if (c > 0) {
_grid->SetColLabelValue (1, _("L"));
@@
-296,6
+300,14
@@
AudioMappingView::set_column_labels ()
_grid->SetColLabelValue (6, _("Rs"));
}
_grid->SetColLabelValue (6, _("Rs"));
}
+ if (c > 6) {
+ _grid->SetColLabelValue (7, _("HI"));
+ }
+
+ if (c > 7) {
+ _grid->SetColLabelValue (8, _("VI"));
+ }
+
_grid->AutoSize ();
}
_grid->AutoSize ();
}