diff options
| author | David Robillard <d@drobilla.net> | 2011-02-16 02:14:40 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-02-16 02:14:40 +0000 |
| commit | beebe6550e4fc00780b9cff57084bf5da3c56118 (patch) | |
| tree | 861a5de6f3398c9115ab1930688193c4cce3b5dc /src/world.c | |
| parent | 4cc15fb56f579e7eab9e0b947c433b96bc4c26f8 (diff) | |
| download | lilv-beebe6550e4fc00780b9cff57084bf5da3c56118.tar.gz lilv-beebe6550e4fc00780b9cff57084bf5da3c56118.tar.bz2 lilv-beebe6550e4fc00780b9cff57084bf5da3c56118.zip | |
Update for new Sord API.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2956 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/world.c')
| -rw-r--r-- | src/world.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/world.c b/src/world.c index 8ef301b..b0c4e66 100644 --- a/src/world.c +++ b/src/world.c @@ -46,7 +46,11 @@ slv2_world_new() { SLV2World world = (SLV2World)malloc(sizeof(struct _SLV2World)); - world->model = sord_new(SORD_SPO|SORD_OPS, true); + world->world = sord_world_new(); + if (!world->world) + goto fail; + + world->model = sord_new(world->world, SORD_SPO|SORD_OPS, true); if (!world->model) goto fail; @@ -55,9 +59,9 @@ slv2_world_new() #define NS_DYNMAN (const uint8_t*)"http://lv2plug.in/ns/ext/dynmanifest#" -#define NEW_URI(uri) sord_new_uri(world->model, uri) +#define NEW_URI(uri) sord_new_uri(world->world, uri) #define NEW_URI_VAL(uri) slv2_value_new_from_node( \ - world, sord_new_uri(world->model, uri)); + world, sord_new_uri(world->world, uri)); world->dyn_manifest_node = NEW_URI(NS_DYNMAN "DynManifest"); world->lv2_specification_node = NEW_URI(SLV2_NS_LV2 "Specification"); @@ -160,6 +164,9 @@ slv2_world_free(SLV2World world) sord_free(world->model); world->model = NULL; + sord_world_free(world->world); + world->world = NULL; + serd_env_free(world->namespaces); free(world); @@ -430,7 +437,7 @@ slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri) SordQuad see_also_tup = { slv2_node_copy(spec), world->rdfs_seealso_node, - sord_new_uri(world->model, manifest_uri.buf), + sord_new_uri(world->world, manifest_uri.buf), NULL }; sord_add(world->model, see_also_tup); |