petern
/
pplugins
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Match by plugin URI instead of UI URI.

master
Peter Nelson 2013-02-12 14:10:14 +00:00
parent cd80d7701c
commit 595baa3a37
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ptap/ptapui.cpp
View File

@ -142,7 +142,7 @@ void PTapUI::InitWidgets()
} }
struct FLV2PUi_PTapUI : LV2PUiFactory<FLV2PUi_PTapUI> { struct FLV2PUi_PTapUI : LV2PUiFactory<FLV2PUi_PTapUI> {
/* virtual */ const char *GetUri() { return PTAP_URI "#X11UI"; } /* virtual */ const char *GetUri() { return PTAP_URI; }
/* virtual */ LV2PUi *CreateInstance() { return new PTapUI(); } /* virtual */ LV2PUi *CreateInstance() { return new PTapUI(); }
}; };

11
pui/lv2pui.cpp
View File

@ -4,6 +4,8 @@
#include "pui.h" #include "pui.h"
#include "lv2pui.h" #include "lv2pui.h"
static char s_lv2ui_uri[128];
static void *lv2pui_thread(void *ptr) static void *lv2pui_thread(void *ptr)
{ {
LV2PUi *lv2pui = (LV2PUi *)ptr; LV2PUi *lv2pui = (LV2PUi *)ptr;
@ -62,10 +64,7 @@ static LV2UI_Handle lv2pui_instantiate(
LV2UI_Widget *widget, LV2UI_Widget *widget,
const LV2_Feature *const *features) const LV2_Feature *const *features)
{ {
char uri[128]; LV2PUi *lv2pui = LV2PUiFactoryBase::CreateInstance(plugin_uri);
snprintf(uri, sizeof uri, "%s#X11UI", plugin_uri);
LV2PUi *lv2pui = LV2PUiFactoryBase::CreateInstance(uri);
if (!lv2pui) return NULL; if (!lv2pui) return NULL;
lv2pui->Instantiate(descriptor, bundle_path, write_function, controller, widget, features); lv2pui->Instantiate(descriptor, bundle_path, write_function, controller, widget, features);
@ -124,7 +123,7 @@ static const void *lv2pui_extension_data(const char *uri)
} }
static LV2UI_Descriptor s_lv2ui_descriptor = { static LV2UI_Descriptor s_lv2ui_descriptor = {
NULL, s_lv2ui_uri,
&lv2pui_instantiate, &lv2pui_instantiate,
&lv2pui_cleanup, &lv2pui_cleanup,
&lv2pui_port_event, &lv2pui_port_event,
@ -136,6 +135,6 @@ const LV2UI_Descriptor *lv2ui_descriptor(uint32_t index)
const char *uri = LV2PUiFactoryBase::GetUri(index); const char *uri = LV2PUiFactoryBase::GetUri(index);
if (!uri) return NULL; if (!uri) return NULL;
s_lv2ui_descriptor.URI = uri; snprintf(s_lv2ui_uri, sizeof s_lv2ui_uri, "%s#%s", uri, "X11UI");
return &s_lv2ui_descriptor; return &s_lv2ui_descriptor;
} }