diff options
| author | David Robillard <d@drobilla.net> | 2011-12-10 00:24:56 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-12-10 00:24:56 +0000 |
| commit | 3af74220b27e5b5b2bfa7061eb773d0a563d2600 (patch) | |
| tree | 40aea8721b3a32d41abce017c899365f0a68d192 | |
| parent | e2c6ce48a51f87274d6566f7e47e81c88bf571bc (diff) | |
| download | lilv-3af74220b27e5b5b2bfa7061eb773d0a563d2600.tar.gz lilv-3af74220b27e5b5b2bfa7061eb773d0a563d2600.tar.bz2 lilv-3af74220b27e5b5b2bfa7061eb773d0a563d2600.zip | |
Fix base URI used for parsing dynmanifest plugin data.
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3847 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/lilv_internal.h | 2 | ||||
| -rw-r--r-- | src/plugin.c | 4 | ||||
| -rw-r--r-- | src/world.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lilv_internal.h b/src/lilv_internal.h index c53eacb..710d00f 100644 --- a/src/lilv_internal.h +++ b/src/lilv_internal.h @@ -85,7 +85,7 @@ struct LilvHeader { #ifdef LILV_DYN_MANIFEST typedef struct { - LilvNode* uri; + LilvNode* bundle; void* lib; LV2_Dyn_Manifest_Handle handle; uint32_t refs; diff --git a/src/plugin.c b/src/plugin.c index f4f1315..f8cf054 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -64,7 +64,7 @@ lilv_plugin_free(LilvPlugin* p) } dlclose(p->dynmanifest->lib); - lilv_node_free(p->dynmanifest->uri); + lilv_node_free(p->dynmanifest->bundle); free(p->dynmanifest); } #endif @@ -154,7 +154,7 @@ lilv_plugin_load(LilvPlugin* p) p->dynmanifest->lib, "lv2_dyn_manifest_get_data"); if (get_data_func) { serd_env_set_base_uri( - env, sord_node_to_serd_node(p->dynmanifest->uri->val.uri_val)); + env, sord_node_to_serd_node(p->dynmanifest->bundle->val.uri_val)); FILE* fd = tmpfile(); get_data_func(p->dynmanifest->handle, fd, lilv_node_as_string(p->plugin_uri)); diff --git a/src/world.c b/src/world.c index 26530a1..7a51a3b 100644 --- a/src/world.c +++ b/src/world.c @@ -460,7 +460,7 @@ lilv_world_load_dyn_manifest(LilvWorld* world, } LilvDynManifest* desc = malloc(sizeof(LilvDynManifest)); - desc->uri = lilv_node_new_from_node(world, dmanifest); + desc->bundle = lilv_node_new_from_node(world, bundle_node); desc->lib = lib; desc->handle = handle; desc->refs = 0; |