Kludge around broken raptor_sequence_set_at.

git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2089 a436a847-0d15-0410-975c-d299462d15a1

4 files changed, 37 insertions, 18 deletions

diff --git a/src/plugin.c b/src/plugin.c
index 21239f3..1b6f3de 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -48,6 +48,7 @@ slv2_plugin_new(SLV2World world, SLV2Value uri, librdf_uri* bundle_uri)
 	plugin->ports = NULL;
 	plugin->storage = NULL;
 	plugin->rdf = NULL;
+	plugin->num_ports = 0;
 
 	return plugin;
 }
@@ -66,9 +67,12 @@ slv2_plugin_free(SLV2Plugin p)
 	slv2_value_free(p->binary_uri);
 	p->binary_uri = NULL;
 
-	if (p->ports)
-		raptor_free_sequence(p->ports);
-	p->ports = NULL;
+	if (p->ports) {
+		for (uint32_t i = 0; i < p->num_ports; ++i)
+			slv2_port_free(p->ports[i]);
+		free(p->ports);
+		p->ports = NULL;
+	}
 
 	if (p->rdf) {
 		librdf_free_model(p->rdf);
@@ -122,7 +126,8 @@ slv2_plugin_load_ports_if_necessary(SLV2Plugin p)
 		slv2_plugin_load(p);
 
 	if (!p->ports) {
-		p->ports = raptor_new_sequence((void (*)(void*))&slv2_port_free, NULL);
+		p->ports = malloc(sizeof(SLV2Port*));
+		p->ports[0] = NULL;
 
 		const unsigned char* query = (const unsigned char*)
 			"PREFIX : <http://lv2plug.in/ns/lv2core#>\n"
@@ -143,17 +148,28 @@ slv2_plugin_load_ports_if_necessary(SLV2Plugin p)
 			librdf_node* symbol_node = librdf_query_results_get_binding_value(results, 1);
 			librdf_node* index_node = librdf_query_results_get_binding_value(results, 2);
 
-			if (librdf_node_is_literal(symbol_node) &&librdf_node_is_literal(index_node)) {
+			if (librdf_node_is_literal(symbol_node) && librdf_node_is_literal(index_node)) {
 				const char* symbol = (const char*)librdf_node_get_literal_value(symbol_node);
 				const char* index = (const char*)librdf_node_get_literal_value(index_node);
 
 				const int this_index = atoi(index);
-				SLV2Port  this_port  = raptor_sequence_get_at(p->ports, this_index);
+				SLV2Port  this_port  = NULL;
+
+				assert(this_index >= 0);
 
-				// Havn't seen this port yet, add it to sequence
+				if (p->num_ports > (unsigned)this_index) {
+					this_port = p->ports[this_index];
+				} else {
+					p->ports = realloc(p->ports, (this_index + 1) * sizeof(SLV2Port*));
+					memset(p->ports + p->num_ports, '\0',
+							(this_index - p->num_ports) * sizeof(SLV2Port));
+					p->num_ports = this_index + 1;
+				}
+
+				// Havn't seen this port yet, add it to array
 				if (!this_port) {
 					this_port = slv2_port_new(p->world, this_index, symbol);
-					raptor_sequence_set_at(p->ports, this_index, this_port);
+					p->ports[this_index] = this_port;
 				}
 
 				raptor_sequence_push(this_port->classes,
@@ -497,7 +513,7 @@ uint32_t
 slv2_plugin_get_num_ports(SLV2Plugin p)
 {
 	slv2_plugin_load_ports_if_necessary(p);
-	return raptor_sequence_size(p->ports);
+	return p->num_ports;
 }
 
 
@@ -508,7 +524,7 @@ slv2_plugin_get_port_float_values(SLV2Plugin  p,
 {
 	slv2_plugin_load_ports_if_necessary(p);
 
-	for (int i = 0; i < raptor_sequence_size(p->ports); ++i)
+	for (uint32_t i = 0; i < p->num_ports; ++i)
 		values[i] = NAN;
 
 	unsigned char* query = (unsigned char*)slv2_strjoin(
@@ -570,8 +586,8 @@ slv2_plugin_get_num_ports_of_class(SLV2Plugin p,
 	uint32_t ret = 0;
 	va_list  args;
 
-	for (unsigned i=0; i < slv2_plugin_get_num_ports(p); ++i) {
-		SLV2Port port = raptor_sequence_get_at(p->ports, i);
+	for (unsigned i=0; i < p->num_ports; ++i) {
+		SLV2Port port = p->ports[i];
 		if (!slv2_port_is_a(p, port, class_1))
 			continue;
 
@@ -691,7 +707,10 @@ slv2_plugin_get_port_by_index(SLV2Plugin p,
                               uint32_t   index)
 {
 	slv2_plugin_load_ports_if_necessary(p);
-	return raptor_sequence_get_at(p->ports, (int)index);
+	if (index < p->num_ports)
+		return p->ports[index];
+	else
+		return NULL;
 }
 
 
@@ -700,8 +719,8 @@ slv2_plugin_get_port_by_symbol(SLV2Plugin p,
                                SLV2Value  symbol)
 {
 	slv2_plugin_load_ports_if_necessary(p);
-	for (int i=0; i < raptor_sequence_size(p->ports); ++i) {
-		SLV2Port port = raptor_sequence_get_at(p->ports, i);
+	for (uint32_t i=0; i < p->num_ports; ++i) {
+		SLV2Port port = p->ports[i];
 		if (slv2_value_equals(port->symbol, symbol))
 			return port;
 	}
diff --git a/src/port.c b/src/port.c
index 50b62c3..197849c 100644
--- a/src/port.c
+++ b/src/port.c
@@ -38,7 +38,6 @@ slv2_port_new(SLV2World world, uint32_t index, const char* symbol)
 	port->index = index;
 	port->symbol = slv2_value_new(world, SLV2_VALUE_STRING, symbol);
 	port->classes = slv2_values_new();
-	//port->node_id = strdup(node_id);
 	return port;
 }
 
diff --git a/src/slv2_internal.h b/src/slv2_internal.h
index b4b23b3..1601a4d 100644
--- a/src/slv2_internal.h
+++ b/src/slv2_internal.h
@@ -61,9 +61,10 @@ struct _SLV2Plugin {
 	SLV2Value            binary_uri; ///< lv2:binary
 	SLV2PluginClass      plugin_class;
 	raptor_sequence*     data_uris;  ///< rdfs::seeAlso
-	raptor_sequence*     ports;
+	SLV2Port*            ports;
 	librdf_storage*      storage;
 	librdf_model*        rdf;
+	uint32_t             num_ports;
 };
 
 SLV2Plugin slv2_plugin_new(SLV2World world, SLV2Value uri, librdf_uri* bundle_uri);
diff --git a/test/slv2_test.c b/test/slv2_test.c
index 72f6a1f..7b52060 100644
--- a/test/slv2_test.c
+++ b/test/slv2_test.c
@@ -554,7 +554,7 @@ test_plugin()
 			":plug a lv2:Plugin ; a lv2:CompressorPlugin ; "
 			PLUGIN_NAME("Test plugin") " ; "
 			LICENSE_GPL " ; "
-    		"lv2:optionalFeature lv2:hardRtCapable ; "
+			"lv2:optionalFeature lv2:hardRtCapable ; "
 		    "lv2:requiredFeature <http://lv2plug.in/ns/ext/event> ; "
 			":foo 1.6180 ; "
 			"doap:maintainer [ foaf:name \"David Robillard\" ; "