diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-28 00:48:09 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-28 00:48:09 +0000 |
commit | 8724caeee874bfa15ca81b0d515692683ffc5461 (patch) | |
tree | 0cabdca6ce2346023c7a622967d6f3fad5df9f66 /gtk2_ardour | |
parent | e9c1fe206d6eb2c7452d82cc633d359a8a0b73b8 (diff) |
add MMC/MIDI feedback options to rc prefs dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@6193 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index acf4c06db4..bf44b1f3ad 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1264,28 +1264,28 @@ RCOptionEditor::RCOptionEditor () midi_combos.push_back (new ComboOption<string> ( "mtc-port-name", - _("Receive MTC via"), + _("Send/Receive MTC via"), mem_fun (*_rc_config, &RCConfiguration::get_mtc_port_name), mem_fun (*_rc_config, &RCConfiguration::set_mtc_port_name) )); midi_combos.push_back (new ComboOption<string> ( "midi-clock-port-name", - _("Receive MIDI clock via"), + _("Send/Receive MIDI clock via"), mem_fun (*_rc_config, &RCConfiguration::get_midi_clock_port_name), mem_fun (*_rc_config, &RCConfiguration::set_midi_clock_port_name) )); midi_combos.push_back (new ComboOption<string> ( "mmc-port-name", - _("Receive MMC via"), + _("Send/Receive MMC via"), mem_fun (*_rc_config, &RCConfiguration::get_mmc_port_name), mem_fun (*_rc_config, &RCConfiguration::set_mmc_port_name) )); midi_combos.push_back (new ComboOption<string> ( "midi-port-name", - _("Receive MIDI parameter control via"), + _("Send/Receive MIDI parameter control via"), mem_fun (*_rc_config, &RCConfiguration::get_midi_port_name), mem_fun (*_rc_config, &RCConfiguration::set_midi_port_name) )); @@ -1297,6 +1297,31 @@ RCOptionEditor::RCOptionEditor () } add_option (_("MIDI control"), + new BoolOption ( + "mmc-control", + _("Obey MIDI Machine Control commands"), + mem_fun (*_rc_config, &RCConfiguration::get_mmc_control), + mem_fun (*_rc_config, &RCConfiguration::set_mmc_control) + )); + + + add_option (_("MIDI control"), + new BoolOption ( + "send-mmc", + _("Send MIDI Machine Control commands"), + mem_fun (*_rc_config, &RCConfiguration::get_send_mmc), + mem_fun (*_rc_config, &RCConfiguration::set_send_mmc) + )); + + add_option (_("MIDI control"), + new BoolOption ( + "midi-feedback", + _("Send MIDI control feedback"), + mem_fun (*_rc_config, &RCConfiguration::get_midi_feedback), + mem_fun (*_rc_config, &RCConfiguration::set_midi_feedback) + )); + + add_option (_("MIDI control"), new SpinOption<uint8_t> ( "mmc-receive-device-id", _("Inbound MMC device ID"), |