diff options
| author | David Robillard <d@drobilla.net> | 2011-02-24 09:00:54 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-02-24 09:00:54 +0000 |
| commit | 25bd8988fb82e6132ae6c1b87e6d0b8087d61f1b (patch) | |
| tree | 63d8b4a0a69c07d012af30b711a0a9cb80a160e6 /src/slv2_internal.h | |
| parent | 5a7ed3f46fa2e0151a0f403824ae3a7df10a6c34 (diff) | |
| download | lilv-25bd8988fb82e6132ae6c1b87e6d0b8087d61f1b.tar.gz lilv-25bd8988fb82e6132ae6c1b87e6d0b8087d61f1b.tar.bz2 lilv-25bd8988fb82e6132ae6c1b87e6d0b8087d61f1b.zip | |
Make Suil exclusively deal with instantiating (not choosing) UIs.
Add slv2_ui_instance_new as a replacement for slv2_ui_instantiate
(now deprecated), which supports cross-toolkit embedding by taking an
additional widget type pointer.
Remove direct Suil dependency from Ingen.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@3022 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/slv2_internal.h')
| -rw-r--r-- | src/slv2_internal.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/slv2_internal.h b/src/slv2_internal.h index 4314a73..1313bd3 100644 --- a/src/slv2_internal.h +++ b/src/slv2_internal.h @@ -41,6 +41,10 @@ extern "C" { #include "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h" #endif +#ifdef HAVE_SUIL +#include "suil/suil.h" +#endif + #include "slv2/slv2.h" #define SLV2_NS_DOAP (const uint8_t*)"http://usefulinc.com/ns/doap#" @@ -151,10 +155,7 @@ struct _SLV2InstanceImpl { /* ********* UI Instance ********* */ struct _SLV2UIInstance { - void* lib_handle; - const LV2UI_Descriptor* lv2ui_descriptor; - LV2UI_Handle lv2ui_handle; - LV2UI_Widget widget; + SuilInstance instance; }; /* ********* Plugin Class ********* */ @@ -238,6 +239,7 @@ struct _SLV2UI { }; SLV2UIs slv2_uis_new(); + SLV2UI slv2_ui_new(SLV2World world, SLV2Value uri, |