summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-01-30 23:54:38 +0000
committerDavid Robillard <d@drobilla.net>2011-01-30 23:54:38 +0000
commit5201a6fe1cef5b322c7c9d3ab968199c29c7e8e3 (patch)
tree1c7b10020743346ab89b40a7a31732272fdaf338 /src
parent41164a763cdc9270dadcf45549c715ce90a47ed5 (diff)
downloadlilv-5201a6fe1cef5b322c7c9d3ab968199c29c7e8e3.tar.gz
lilv-5201a6fe1cef5b322c7c9d3ab968199c29c7e8e3.tar.bz2
lilv-5201a6fe1cef5b322c7c9d3ab968199c29c7e8e3.zip
Replace slv2_plugin_new librdf_node* argument with SLV2Value.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2878 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/plugin.c4
-rw-r--r--src/slv2_internal.h2
-rw-r--r--src/world.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/plugin.c b/src/plugin.c
index 43eb0f8..4e2a630 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -37,13 +37,13 @@
/* private
* ownership of uri is taken */
SLV2Plugin
-slv2_plugin_new(SLV2World world, SLV2Value uri, librdf_uri* bundle_uri)
+slv2_plugin_new(SLV2World world, SLV2Value uri, SLV2Value bundle_uri)
{
assert(bundle_uri);
struct _SLV2Plugin* plugin = malloc(sizeof(struct _SLV2Plugin));
plugin->world = world;
plugin->plugin_uri = uri;
- plugin->bundle_uri = slv2_value_new_librdf_uri(world, bundle_uri);
+ plugin->bundle_uri = bundle_uri;
plugin->binary_uri = NULL;
#ifdef SLV2_DYN_MANIFEST
plugin->dynman_uri = NULL;
diff --git a/src/slv2_internal.h b/src/slv2_internal.h
index e014346..5fab870 100644
--- a/src/slv2_internal.h
+++ b/src/slv2_internal.h
@@ -89,7 +89,7 @@ struct _SLV2Plugin {
uint32_t num_ports;
};
-SLV2Plugin slv2_plugin_new(SLV2World world, SLV2Value uri, librdf_uri* bundle_uri);
+SLV2Plugin slv2_plugin_new(SLV2World world, SLV2Value uri, SLV2Value bundle_uri);
void slv2_plugin_load(SLV2Plugin p);
void slv2_plugin_load_if_necessary(SLV2Plugin p);
void slv2_plugin_load_ports_if_necessary(SLV2Plugin p);
diff --git a/src/world.c b/src/world.c
index 01d05cd..f775601 100644
--- a/src/world.c
+++ b/src/world.c
@@ -680,7 +680,9 @@ slv2_world_load_all(SLV2World world)
}
#endif
- SLV2Plugin plugin = slv2_plugin_new(world, uri, bundle_uri);
+ SLV2Plugin plugin = slv2_plugin_new(
+ world, uri, slv2_value_new_librdf_uri(world, bundle_uri));
+
raptor_sequence_push(world->plugins, plugin);
#ifdef SLV2_DYN_MANIFEST