diff options
| author | David Robillard <d@drobilla.net> | 2011-04-22 08:08:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-04-22 08:08:37 +0000 |
| commit | c37722f7dc3c3872095a70eb35bd43f4662d99f5 (patch) | |
| tree | a51d2b31118ed41374ea754480f2bc548fda0214 /gtk2_ardour/lv2_plugin_ui.h | |
| parent | 12bb5b62071e25168922ef0fe27f23493bed05db (diff) | |
Use new Suil and SLV2 APIs for LV2 plugin UIs.
Add lv2_ui.h (required by lv2_external_ui.h).
git-svn-id: svn://localhost/ardour2/branches/3.0@9406 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/lv2_plugin_ui.h')
| -rw-r--r-- | gtk2_ardour/lv2_plugin_ui.h | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h index 158c7cb2e0..7a784e2d67 100644 --- a/gtk2_ardour/lv2_plugin_ui.h +++ b/gtk2_ardour/lv2_plugin_ui.h @@ -40,6 +40,10 @@ #include "lv2_external_ui.h" +#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL) +#include <suil/suil.h> +#endif + namespace ARDOUR { class PluginInsert; class LV2Plugin; @@ -66,9 +70,8 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox std::vector<int> _output_ports; sigc::connection _screen_update_connection; - Gtk::Widget* _gui_widget; - SLV2UIInstance _inst; - float* _values; + Gtk::Widget* _gui_widget; + float* _values; std::vector<boost::shared_ptr<ARDOUR::AutomationControl> > _controllables; struct lv2_external_ui_host _external_ui_host; @@ -76,19 +79,23 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox struct lv2_external_ui* _external_ui_ptr; Gtk::Window* _win_ptr; - static void on_external_ui_closed(LV2UI_Controller controller); + static void on_external_ui_closed(void* controller); -#ifdef HAVE_NEW_SLV2 - static SLV2UIHost ui_host; +#if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL) + static SuilHost ui_host; static SLV2Value ui_GtkUI; + + SuilInstance _inst; +#else + SLV2UIInstance _inst; #endif static void lv2_ui_write( - LV2UI_Controller controller, - uint32_t port_index, - uint32_t buffer_size, - uint32_t format, - const void* buffer); + void* controller, + uint32_t port_index, + uint32_t buffer_size, + uint32_t format, + const void* buffer); void lv2ui_instantiate(const std::string& title); |