From 39b0b60bcadacf15aef036db05417aa4dbfcd322 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 29 Jan 2011 05:42:52 +0000 Subject: Tidy. git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2846 a436a847-0d15-0410-975c-d299462d15a1 --- src/slv2_internal.h | 3 +++ src/world.c | 27 +++++++++++---------------- 2 files changed, 14 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/slv2_internal.h b/src/slv2_internal.h index 7d7e727..e735800 100644 --- a/src/slv2_internal.h +++ b/src/slv2_internal.h @@ -38,6 +38,9 @@ extern "C" { #define SLV2_NS_RDFS (const unsigned char*)"http://www.w3.org/2000/01/rdf-schema#" #define SLV2_NS_SLV2 (const unsigned char*)"http://drobilla.net/ns/slv2#" +#define SLV2_NS_LV2 (const unsigned char*)"http://lv2plug.in/ns/lv2core#" +#define SLV2_NS_XSD (const unsigned char*)"http://www.w3.org/2001/XMLSchema#" +#define SLV2_NS_RDF (const unsigned char*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#" /* ********* PORT ********* */ diff --git a/src/world.c b/src/world.c index e66534c..b211414 100644 --- a/src/world.c +++ b/src/world.c @@ -55,22 +55,17 @@ slv2_world_new_internal(SLV2World world) world->plugins = slv2_plugins_new(); -#define NEW_URI(uri) librdf_new_node_from_uri_string(world->world, \ - (const unsigned char*)uri); - -#define NS_LV2 "http://lv2plug.in/ns/lv2core#" -#define NS_XSD "http://www.w3.org/2001/XMLSchema#" -#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" - - world->lv2_specification_node = NEW_URI(NS_LV2 "Specification"); - world->lv2_plugin_node = NEW_URI(NS_LV2 "Plugin"); - world->lv2_binary_node = NEW_URI(NS_LV2 "binary"); - world->lv2_port_node = NEW_URI(NS_LV2 "port"); - world->lv2_index_node = NEW_URI(NS_LV2 "index"); - world->lv2_symbol_node = NEW_URI(NS_LV2 "symbol"); - world->rdf_a_node = NEW_URI(NS_RDF "type"); - world->xsd_integer_node = NEW_URI(NS_XSD "integer"); - world->xsd_decimal_node = NEW_URI(NS_XSD "decimal"); +#define NEW_URI(uri) librdf_new_node_from_uri_string(world->world, uri); + + world->lv2_specification_node = NEW_URI(SLV2_NS_LV2 "Specification"); + world->lv2_plugin_node = NEW_URI(SLV2_NS_LV2 "Plugin"); + world->lv2_binary_node = NEW_URI(SLV2_NS_LV2 "binary"); + world->lv2_port_node = NEW_URI(SLV2_NS_LV2 "port"); + world->lv2_index_node = NEW_URI(SLV2_NS_LV2 "index"); + world->lv2_symbol_node = NEW_URI(SLV2_NS_LV2 "symbol"); + world->rdf_a_node = NEW_URI(SLV2_NS_RDF "type"); + world->xsd_integer_node = NEW_URI(SLV2_NS_XSD "integer"); + world->xsd_decimal_node = NEW_URI(SLV2_NS_XSD "decimal"); world->lv2_plugin_class = slv2_plugin_class_new(world, NULL, librdf_node_get_uri(world->lv2_plugin_node), "Plugin"); -- cgit v1.2.1