ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove "Use OSC" from options menu; make OSC optional rather than a mandatory protocol

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4412 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-01-15 22:37:18 +00:00
parent 16556bb182
commit b3c6c4a6d5
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/ardour_ui_ed.cc
View File

@ -441,11 +441,6 @@ ARDOUR_UI::install_actions ()
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);
act = ActionManager::register_toggle_action (option_actions, X_("UseOSC"), _("Use OSC"), mem_fun (*this, &ARDOUR_UI::toggle_use_osc));
#ifndef HAVE_LIBLO
act->set_sensitive (false);
#endif
act = ActionManager::register_toggle_action (option_actions, X_("ToggleTapeMachineMode"), _("Tape Machine Mode"), mem_fun (*this, &ARDOUR_UI::toggle_TapeMachineMode));
ActionManager::session_sensitive_actions.push_back (act);

5
libs/surfaces/osc/interface.cc
View File

@ -1,6 +1,5 @@
/*
* Copyright (C) 2006 Paul Davis
* Copyright (C) 2007 Michael Taht
* Copyright (C) 2009 Paul Davis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -50,7 +49,7 @@ static ControlProtocolDescriptor osc_descriptor = {
id : "uri://ardour.org/surfaces/osc:0",
ptr : 0,
module : 0,
mandatory : 1,
mandatory : 0,
supports_feedback : true,
probe : probe_osc_protocol,
initialize : new_osc_protocol,