diff options
| author | Hans Baier <hansfbaier@googlemail.com> | 2008-11-26 23:32:55 +0000 |
|---|---|---|
| committer | Hans Baier <hansfbaier@googlemail.com> | 2008-11-26 23:32:55 +0000 |
| commit | 5ed141cd143abac95ba37c8d944ece847ba86173 (patch) | |
| tree | 8a67244499b45b4d34685a0c0ad74981991e35e9 /gtk2_ardour | |
| parent | 38382b792113cbf23881c1dca64e16c2d0207d45 (diff) | |
* added Menu for sending midi clock
* hooked up MidiClockTicker to the session
git-svn-id: svn://localhost/ardour2/branches/3.0@4267 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour.menus | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 6 |
4 files changed, 10 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index 8c504f5511..9d4f57465b 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -430,6 +430,7 @@ </menu> <menu action='SyncMenu'> <menuitem action='SendMTC'/> + <menuitem action='SendMidiClock'/> <menuitem action='SendMMC'/> <menuitem action='UseMMC'/> </menu> diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 64cdf1348f..8243a40fd1 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -701,6 +701,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI void toggle_use_mmc (); void toggle_send_mmc (); void toggle_send_mtc (); + void toggle_send_midi_clock (); void toggle_use_osc (); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 89fa04c79b..4b7008e027 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -436,6 +436,8 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (option_actions, X_("UseMMC"), _("Use MMC"), mem_fun (*this, &ARDOUR_UI::toggle_use_mmc)); ActionManager::session_sensitive_actions.push_back (act); + act = ActionManager::register_toggle_action (option_actions, X_("SendMidiClock"), _("Send MIDI Clock"), mem_fun (*this, &ARDOUR_UI::toggle_send_midi_clock)); + ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (option_actions, X_("SendMIDIfeedback"), _("Send MIDI feedback"), mem_fun (*this, &ARDOUR_UI::toggle_send_midi_feedback)); ActionManager::session_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 410c39268c..4c80b8dd35 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -62,6 +62,12 @@ ARDOUR_UI::toggle_send_mmc () } void +ARDOUR_UI::toggle_send_midi_clock () +{ + ActionManager::toggle_config_state ("options", "SendMidiClock", &Configuration::set_send_midi_clock, &Configuration::get_send_midi_clock); +} + +void ARDOUR_UI::toggle_use_mmc () { ActionManager::toggle_config_state ("options", "UseMMC", &Configuration::set_mmc_control, &Configuration::get_mmc_control); |