diff options
| author | David Robillard <d@drobilla.net> | 2012-01-04 19:45:31 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-01-04 19:45:31 +0000 |
| commit | 84ee3d3636f642df74cec72541416a387e730842 (patch) | |
| tree | d9d0ced31601c618509ec037c84cce0b2d816192 /src/world.c | |
| parent | 7823f743ee0c748ff4ced56838cd737516d857ab (diff) | |
| download | lilv-84ee3d3636f642df74cec72541416a387e730842.tar.gz lilv-84ee3d3636f642df74cec72541416a387e730842.tar.bz2 lilv-84ee3d3636f642df74cec72541416a387e730842.zip | |
Consistently use SordNode for internal URIs.
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3916 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/world.c')
| -rw-r--r-- | src/world.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/world.c b/src/world.c index 8151a73..1bf357a 100644 --- a/src/world.c +++ b/src/world.c @@ -50,20 +50,24 @@ lilv_world_new(void) #define NS_PSET "http://lv2plug.in/ns/ext/presets#" #define NEW_URI(uri) sord_new_uri(world->world, (const uint8_t*)uri) -#define NEW_URI_VAL(uri) lilv_new_uri(world, (const char*)(uri)); world->dc_replaces_node = NEW_URI(NS_DCTERMS "replaces"); + world->doap_name_node = NEW_URI(LILV_NS_DOAP "name"); world->dyn_manifest_node = NEW_URI(NS_DYNMAN "DynManifest"); world->lv2_appliesTo_node = NEW_URI(LILV_NS_LV2 "appliesTo"); world->lv2_binary_node = NEW_URI(LILV_NS_LV2 "binary"); world->lv2_default_node = NEW_URI(LILV_NS_LV2 "default"); + world->lv2_extensionData_node = NEW_URI(LILV_NS_LV2 "extensionData"); world->lv2_index_node = NEW_URI(LILV_NS_LV2 "index"); world->lv2_maximum_node = NEW_URI(LILV_NS_LV2 "maximum"); world->lv2_minimum_node = NEW_URI(LILV_NS_LV2 "minimum"); + world->lv2_name_node = NEW_URI(LILV_NS_LV2 "name"); + world->lv2_optionalFeature_node = NEW_URI(LILV_NS_LV2 "optionalFeature"); world->lv2_plugin_node = NEW_URI(LILV_NS_LV2 "Plugin"); world->lv2_port_node = NEW_URI(LILV_NS_LV2 "port"); world->lv2_portproperty_node = NEW_URI(LILV_NS_LV2 "portProperty"); world->lv2_reportslatency_node = NEW_URI(LILV_NS_LV2 "reportsLatency"); + world->lv2_requiredFeature_node = NEW_URI(LILV_NS_LV2 "requiredFeature"); world->lv2_specification_node = NEW_URI(LILV_NS_LV2 "Specification"); world->lv2_symbol_node = NEW_URI(LILV_NS_LV2 "symbol"); world->pset_value_node = NEW_URI(NS_PSET "value"); @@ -79,12 +83,6 @@ lilv_world_new(void) world->xsd_double_node = NEW_URI(LILV_NS_XSD "double"); world->xsd_integer_node = NEW_URI(LILV_NS_XSD "integer"); - world->doap_name_val = NEW_URI_VAL(LILV_NS_DOAP "name"); - world->lv2_extensionData_val = NEW_URI_VAL(LILV_NS_LV2 "extensionData"); - world->lv2_name_val = NEW_URI_VAL(LILV_NS_LV2 "name"); - world->lv2_optionalFeature_val = NEW_URI_VAL(LILV_NS_LV2 "optionalFeature"); - world->lv2_requiredFeature_val = NEW_URI_VAL(LILV_NS_LV2 "requiredFeature"); - world->lv2_plugin_class = lilv_plugin_class_new( world, NULL, world->lv2_plugin_node, "Plugin"); assert(world->lv2_plugin_class); @@ -112,17 +110,22 @@ lilv_world_free(LilvWorld* world) world->lv2_plugin_class = NULL; sord_node_free(world->world, world->dc_replaces_node); + sord_node_free(world->world, world->doap_name_node); sord_node_free(world->world, world->dyn_manifest_node); sord_node_free(world->world, world->lv2_appliesTo_node); sord_node_free(world->world, world->lv2_binary_node); sord_node_free(world->world, world->lv2_default_node); + sord_node_free(world->world, world->lv2_extensionData_node); sord_node_free(world->world, world->lv2_index_node); sord_node_free(world->world, world->lv2_maximum_node); sord_node_free(world->world, world->lv2_minimum_node); + sord_node_free(world->world, world->lv2_name_node); + sord_node_free(world->world, world->lv2_optionalFeature_node); sord_node_free(world->world, world->lv2_plugin_node); sord_node_free(world->world, world->lv2_port_node); sord_node_free(world->world, world->lv2_portproperty_node); sord_node_free(world->world, world->lv2_reportslatency_node); + sord_node_free(world->world, world->lv2_requiredFeature_node); sord_node_free(world->world, world->lv2_specification_node); sord_node_free(world->world, world->lv2_symbol_node); sord_node_free(world->world, world->pset_value_node); @@ -137,11 +140,6 @@ lilv_world_free(LilvWorld* world) sord_node_free(world->world, world->xsd_decimal_node); sord_node_free(world->world, world->xsd_double_node); sord_node_free(world->world, world->xsd_integer_node); - lilv_node_free(world->doap_name_val); - lilv_node_free(world->lv2_extensionData_val); - lilv_node_free(world->lv2_name_val); - lilv_node_free(world->lv2_optionalFeature_val); - lilv_node_free(world->lv2_requiredFeature_val); for (LilvSpec* spec = world->specs; spec;) { LilvSpec* next = spec->next; |