diff options
| author | David Robillard <d@drobilla.net> | 2011-02-24 01:31:49 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-02-24 01:31:49 +0000 |
| commit | 5a7ed3f46fa2e0151a0f403824ae3a7df10a6c34 (patch) | |
| tree | e3784b267aabde08776650a50691a43f6290a9c9 /src | |
| parent | 468edb7f7be73505a4a73590443e3c8655ce1b82 (diff) | |
| download | lilv-5a7ed3f46fa2e0151a0f403824ae3a7df10a6c34.tar.gz lilv-5a7ed3f46fa2e0151a0f403824ae3a7df10a6c34.tar.bz2 lilv-5a7ed3f46fa2e0151a0f403824ae3a7df10a6c34.zip | |
Move UI stuff back into slv2.h (avoid breakage).
Deprecate slv2_ui_instance_get_descriptor and slv2_ui_instance_get_handle.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@3020 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/collections.c | 2 | ||||
| -rw-r--r-- | src/plugin.c | 2 | ||||
| -rw-r--r-- | src/slv2_internal.h | 9 |
3 files changed, 0 insertions, 13 deletions
diff --git a/src/collections.c b/src/collections.c index 6ec004e..9ad2ddc 100644 --- a/src/collections.c +++ b/src/collections.c @@ -108,10 +108,8 @@ prefix ## _get_by_uri(CollType coll, SLV2Value uri) \ SLV2_SEQUENCE_IMPL(SLV2PluginClasses, SLV2PluginClass, slv2_plugin_classes, &slv2_plugin_class_free) -#ifdef SLV2_WITH_UI SLV2_SEQUENCE_IMPL(SLV2UIs, SLV2UI, slv2_uis, &slv2_ui_free) -#endif /* VALUES */ diff --git a/src/plugin.c b/src/plugin.c index 2987371..f06cfd7 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -760,7 +760,6 @@ slv2_plugin_get_author_homepage(SLV2Plugin plugin) return NULL; } -#ifdef SLV2_WITH_UI SLV2_API SLV2UIs slv2_plugin_get_uis(SLV2Plugin p) @@ -811,4 +810,3 @@ slv2_plugin_get_uis(SLV2Plugin p) return NULL; } } -#endif /* SLV2_WITH_UI */ diff --git a/src/slv2_internal.h b/src/slv2_internal.h index a52f62e..4314a73 100644 --- a/src/slv2_internal.h +++ b/src/slv2_internal.h @@ -42,9 +42,6 @@ extern "C" { #endif #include "slv2/slv2.h" -#ifdef SLV2_WITH_UI -#include "slv2/ui.h" -#endif #define SLV2_NS_DOAP (const uint8_t*)"http://usefulinc.com/ns/doap#" #define SLV2_NS_RDFS (const uint8_t*)"http://www.w3.org/2000/01/rdf-schema#" @@ -153,14 +150,12 @@ struct _SLV2InstanceImpl { /* ********* UI Instance ********* */ -#ifdef SLV2_WITH_UI struct _SLV2UIInstance { void* lib_handle; const LV2UI_Descriptor* lv2ui_descriptor; LV2UI_Handle lv2ui_handle; LV2UI_Widget widget; }; -#endif /* ********* Plugin Class ********* */ @@ -234,8 +229,6 @@ slv2_world_load_file(SLV2World world, const char* file_uri); /* ********* Plugin UI ********* */ -#ifdef SLV2_WITH_UI - struct _SLV2UI { struct _SLV2World* world; SLV2Value uri; @@ -253,8 +246,6 @@ slv2_ui_new(SLV2World world, void slv2_ui_free(SLV2UI ui); -#endif /* SLV2_WITH_UI */ - /* ********* Value ********* */ typedef enum _SLV2ValueType { |