diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-15 22:53:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-15 22:53:21 +0100 |
| commit | bb5434e9845556a0bd58792c3082a8a15abd127e (patch) | |
| tree | af13c14ba9d2aa8af5fba9d2ecdef1b3c5fbfad8 /src/wx/dcp_panel.cc | |
| parent | 49b0830290ed067f94c5f87690e9167c5706d532 (diff) | |
Add channel count hints to the default audio channel count preference,
and remove the choice for default to zero channels. Remove em-dash
from hints as it apparently does not render on Windows for some reason.
Diffstat (limited to 'src/wx/dcp_panel.cc')
| -rw-r--r-- | src/wx/dcp_panel.cc | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 5b882763f..49595dfd7 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -404,7 +404,7 @@ DCPPanel::film_changed (int p) } else { checked_set (_audio_processor, 0); } - setup_audio_channels_choice (); + setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); film_changed (Film::AUDIO_CHANNELS); break; case Film::REEL_TYPE: @@ -728,29 +728,6 @@ DCPPanel::minimum_allowed_audio_channels () const return min; } -void -DCPPanel::setup_audio_channels_choice () -{ - vector<pair<string, string> > items; - for (int i = minimum_allowed_audio_channels(); i <= 16; i += 2) { - if (i == 2) { - items.push_back (make_pair (wx_to_std (_("2 — stereo")), dcp::raw_convert<string> (i))); - } else if (i == 4) { - items.push_back (make_pair (wx_to_std (_("4 — L/C/R/Lfe")), dcp::raw_convert<string> (i))); - } else if (i == 6) { - items.push_back (make_pair (wx_to_std (_("6 — 5.1")), dcp::raw_convert<string> (i))); - } else if (i == 8) { - items.push_back (make_pair (wx_to_std (_("8 — 5.1/HI/VI")), dcp::raw_convert<string> (i))); - } else if (i == 12) { - items.push_back (make_pair (wx_to_std (_("12 — 7.1/HI/VI")), dcp::raw_convert<string> (i))); - } else { - items.push_back (make_pair (dcp::raw_convert<string> (i), dcp::raw_convert<string> (i))); - } - } - - checked_set (_audio_channels, items); -} - wxPanel * DCPPanel::make_audio_panel () { @@ -764,7 +741,7 @@ DCPPanel::make_audio_panel () add_label_to_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0)); _audio_channels = new wxChoice (panel, wxID_ANY); - setup_audio_channels_choice (); + setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); grid->Add (_audio_channels, wxGBPosition (r, 1)); ++r; |