projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove explicit setting of Toggle flag for AutomationControls
[ardour.git]
/
gtk2_ardour
/
plugin_ui.cc
diff --git
a/gtk2_ardour/plugin_ui.cc
b/gtk2_ardour/plugin_ui.cc
index d351e5efba147195ae2f73f6257e1c0661cf9ec6..c9493fbb1b1b06c2c617b74e02aae025b0374f2d 100644
(file)
--- a/
gtk2_ardour/plugin_ui.cc
+++ b/
gtk2_ardour/plugin_ui.cc
@@
-178,7
+178,7
@@
PluginUIWindow::on_show ()
}
if (_pluginui) {
}
if (_pluginui) {
-#if defined (HAVE_AUDIOUNITS) && defined(
GTKOSX
)
+#if defined (HAVE_AUDIOUNITS) && defined(
__APPLE__
)
if (pre_deactivate_x >= 0) {
move (pre_deactivate_x, pre_deactivate_y);
}
if (pre_deactivate_x >= 0) {
move (pre_deactivate_x, pre_deactivate_y);
}
@@
-193,7
+193,7
@@
PluginUIWindow::on_show ()
void
PluginUIWindow::on_hide ()
{
void
PluginUIWindow::on_hide ()
{
-#if defined (HAVE_AUDIOUNITS) && defined(
GTKOSX
)
+#if defined (HAVE_AUDIOUNITS) && defined(
__APPLE__
)
get_position (pre_deactivate_x, pre_deactivate_y);
#endif
get_position (pre_deactivate_x, pre_deactivate_y);
#endif
@@
-293,7
+293,7
@@
PluginUIWindow::create_audiounit_editor (boost::shared_ptr<PluginInsert>)
}
void
}
void
-#ifdef
GTKOSX
+#ifdef
__APPLE__
PluginUIWindow::app_activated (bool yn)
#else
PluginUIWindow::app_activated (bool)
PluginUIWindow::app_activated (bool yn)
#else
PluginUIWindow::app_activated (bool)
@@
-362,11
+362,11
@@
PluginUIWindow::on_key_press_event (GdkEventKey* event)
}
}
return true;
}
}
return true;
- }
+ }
/* for us to be getting key press events, there really
MUST be a _pluginui, but just to be safe, check ...
*/
/* for us to be getting key press events, there really
MUST be a _pluginui, but just to be safe, check ...
*/
-
+
if (_pluginui) {
_pluginui->grab_focus();
if (_pluginui->non_gtk_gui()) {
if (_pluginui) {
_pluginui->grab_focus();
if (_pluginui->non_gtk_gui()) {
@@
-379,7
+379,7
@@
PluginUIWindow::on_key_press_event (GdkEventKey* event)
} else {
return relay_key_press (event, this);
}
} else {
return relay_key_press (event, this);
}
- }
+ }
return false;
}
return false;
}
@@
-561,7
+561,7
@@
PlugUIBase::preset_selected (Plugin::PresetRecord preset)
return;
}
if (!preset.label.empty()) {
return;
}
if (!preset.label.empty()) {
-
plugin
->load_preset (preset);
+
insert
->load_preset (preset);
} else {
// blank selected = no preset
plugin->clear_preset();
} else {
// blank selected = no preset
plugin->clear_preset();