diff options
| author | David Robillard <d@drobilla.net> | 2011-05-14 19:55:46 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-05-14 19:55:46 +0000 |
| commit | ac367e89043e0a7f0db6ca44edf5edaab27e8091 (patch) | |
| tree | fee7749971885379cb8ce52aa03778c6f58544c4 /gtk2_ardour | |
| parent | 8e717d107f5fcf1a800fffd3126983addb8ec5cc (diff) | |
Make LV2World local to lv2_plugin.cc
git-svn-id: svn://localhost/ardour2/branches/3.0@9513 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/lv2_plugin_ui.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index cd43f410f4..8e2cd34164 100644 --- a/gtk2_ardour/lv2_plugin_ui.cc +++ b/gtk2_ardour/lv2_plugin_ui.cc @@ -32,6 +32,8 @@ using namespace Gtk; using namespace ARDOUR; using namespace PBD; +#define NS_UI "http://lv2plug.in/ns/extensions/ui#" + #if defined(HAVE_NEW_SLV2) && defined(HAVE_SUIL) SuilHost* LV2PluginUI::ui_host = NULL; #endif @@ -180,14 +182,15 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title) LV2PluginUI::ui_host = suil_host_new( LV2PluginUI::lv2_ui_write, NULL, NULL, NULL); } - LV2World* lv2_world = ARDOUR::PluginManager::the_manager()->lv2_world(); - SLV2Value container_type = (is_external_ui) - ? lv2_world->external_gui : lv2_world->gtk_gui; + const char* container_type = (is_external_ui) + ? NS_UI "external" + : NS_UI "GtkUI"; + SLV2UI ui = _lv2->slv2_ui(); _inst = suil_instance_new( LV2PluginUI::ui_host, this, - slv2_value_as_uri(container_type), + container_type, slv2_value_as_uri(slv2_plugin_get_uri(_lv2->slv2_plugin())), slv2_value_as_uri(slv2_ui_get_uri(ui)), slv2_value_as_uri(_lv2->ui_type()), |