From 4e49c56361ef06d75696e4eac77ba59c1ed1aa3f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 14 May 2011 21:05:26 +0000 Subject: Completely localist use of SLV2 to lv2_plugin.cc and lv2_plugin_ui.cc. git-svn-id: svn://localhost/ardour2/branches/3.0@9514 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/lv2_plugin_ui.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gtk2_ardour/lv2_plugin_ui.h') diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h index ccbd177f56..7fb311c81f 100644 --- a/gtk2_ardour/lv2_plugin_ui.h +++ b/gtk2_ardour/lv2_plugin_ui.h @@ -36,14 +36,10 @@ #include "ardour/types.h" #include "plugin_ui.h" -#ifdef HAVE_SLV2 +#ifdef LV2_SUPPORT #include "lv2_external_ui.h" -#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL) -#include -#endif - namespace ARDOUR { class PluginInsert; class LV2Plugin; @@ -81,15 +77,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox static void on_external_ui_closed(void* controller); -#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL) - static SuilHost* ui_host; - static SLV2Value ui_GtkUI; - static SLV2Value ui_external; - - SuilInstance* _inst; -#else - SLV2UIInstance _inst; -#endif + void* _inst; static void lv2_ui_write( void* controller, @@ -110,7 +98,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox virtual void on_window_hide(); }; -#endif // HAVE_SLV2 +#endif // LV2_SUPPORT #endif /* __ardour_lv2_plugin_ui_h__ */ -- cgit v1.2.3