smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

merge 12096:12268 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12269 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-14 18:35:19 +00:00
parent 9c8b57aab0
commit d6edbf5ca2
162 changed files with 2931 additions and 1064 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gtk2_ardour/rc_option_editor.cc
View file

@ -722,7 +722,18 @@ private:
if (!was_enabled) {
ControlProtocolManager::instance().instantiate (*cpi);
} else {
Gtk::Window* win = r[_model.editor];
if (win) {
win->hide ();
}
ControlProtocolManager::instance().teardown (*cpi);
if (win) {
delete win;
}
r[_model.editor] = 0;
cpi->requested = false;
}
}
@ -1573,7 +1584,7 @@ RCOptionEditor::RCOptionEditor ()
add_option (S_("Visual|Interface"),
new BoolOption (
"use-own-plugin-gui",
_("Use plugins' own interface instead of a builtin one"),
_("Use plugins' own interfaces instead of Ardour's"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui)
));