From 6fadaae2cbc6ed0bc83136cde7536623894f819d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 15 Mar 2007 13:25:01 +0000 Subject: make OSC off by default, and add menu item to control it git-svn-id: svn://localhost/ardour2/trunk@1594 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui_options.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gtk2_ardour/ardour_ui_options.cc') diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 8e87810ac4..a90e06bc61 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -24,6 +24,7 @@ #include #include +#include #include #include "ardour_ui.h" @@ -62,6 +63,12 @@ ARDOUR_UI::toggle_use_mmc () ActionManager::toggle_config_state ("options", "UseMMC", &Configuration::set_mmc_control, &Configuration::get_mmc_control); } +void +ARDOUR_UI::toggle_use_osc () +{ + ActionManager::toggle_config_state ("options", "UseOSC", &Configuration::set_use_osc, &Configuration::get_use_osc); +} + void ARDOUR_UI::toggle_use_midi_control () { @@ -844,6 +851,16 @@ ARDOUR_UI::parameter_changed (const char* parameter_name) ActionManager::map_some_state ("options", "SendMMC", &Configuration::get_send_mmc); + } else if (PARAM_IS ("use-osc")) { + + if (Config->get_use_osc()) { + osc->start (); + } else { + osc->stop (); + } + + ActionManager::map_some_state ("options", "UseOSC", &Configuration::get_use_osc); + } else if (PARAM_IS ("mmc-control")) { ActionManager::map_some_state ("options", "UseMMC", &Configuration::get_mmc_control); } else if (PARAM_IS ("midi-feedback")) { -- cgit v1.2.3