diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-08-03 11:15:01 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-08-03 11:15:01 +0000 |
| commit | 9e6eb3e0c732cc399ed3b925ef6c584edc853dc7 (patch) | |
| tree | e12c9460b65a55ca1e612dc5a9d47fd1926ff958 /gtk2_ardour/rc_option_editor.cc | |
| parent | ad4f943f5ab0b3faa0ab87d0cd714efc7bf931d1 (diff) | |
Apply x42's patch from #4207; rename MIDI control
preferences to just MIDI.
git-svn-id: svn://localhost/ardour2/branches/3.0@9948 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/rc_option_editor.cc')
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 72ef75ff4d..597bdb50fc 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1343,7 +1343,7 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_main_outs) )); - add_option (_("MIDI control"), + add_option (_("MIDI"), new BoolOption ( "send-midi-clock", _("Send MIDI Clock"), @@ -1351,7 +1351,7 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_midi_clock) )); - add_option (_("MIDI control"), + add_option (_("MIDI"), new BoolOption ( "send-mtc", _("Send MIDI Time Code"), @@ -1359,7 +1359,7 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mtc) )); - add_option (_("MIDI control"), + add_option (_("MIDI"), new SpinOption<int> ( "mtc-qf-speed-tolerance", _("Percentage either side of normal transport speed to transmit MTC"), @@ -1368,7 +1368,7 @@ RCOptionEditor::RCOptionEditor () 0, 20, 1, 5 )); - add_option (_("MIDI control"), + add_option (_("MIDI"), new BoolOption ( "mmc-control", _("Obey MIDI Machine Control commands"), @@ -1376,7 +1376,7 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_mmc_control) )); - add_option (_("MIDI control"), + add_option (_("MIDI"), new BoolOption ( "send-mmc", _("Send MIDI Machine Control commands"), @@ -1384,7 +1384,7 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_mmc) )); - add_option (_("MIDI control"), + add_option (_("MIDI"), new BoolOption ( "midi-feedback", _("Send MIDI control feedback"), @@ -1392,7 +1392,7 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_feedback) )); - add_option (_("MIDI control"), + add_option (_("MIDI"), new SpinOption<uint8_t> ( "mmc-receive-device-id", _("Inbound MMC device ID"), @@ -1401,7 +1401,7 @@ RCOptionEditor::RCOptionEditor () 0, 128, 1, 10 )); - add_option (_("MIDI control"), + add_option (_("MIDI"), new SpinOption<uint8_t> ( "mmc-send-device-id", _("Outbound MMC device ID"), @@ -1410,7 +1410,7 @@ RCOptionEditor::RCOptionEditor () 0, 128, 1, 10 )); - add_option (_("MIDI control"), + add_option (_("MIDI"), new SpinOption<int32_t> ( "initial-program-change", _("Initial program change"), @@ -1419,6 +1419,14 @@ RCOptionEditor::RCOptionEditor () -1, 65536, 1, 10 )); + add_option (_("MIDI"), + new BoolOption ( + "diplay-first-midi-bank-as-zero", + _("Display first MIDI bank/program as 0"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero) + )); + /* CONTROL SURFACES */ add_option (_("Control surfaces"), new ControlSurfacesOptions (*this)); |