- Removed all the unsigned char garbage from the API

- Updated types in lv2.h to be non-machine-dependant (removed unsigned long in favour of uint32_t)
- Updated schema
- Updated example plugin to work with the above (partially)


git-svn-id: http://svn.drobilla.net/lad/libslv2@101 a436a847-0d15-0410-975c-d299462d15a1

2 files changed, 13 insertions, 71 deletions

diff --git a/examples/hosts/jack_host.c b/examples/hosts/jack_host.c
index 1be62b8..a29fb13 100644
--- a/examples/hosts/jack_host.c
+++ b/examples/hosts/jack_host.c
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <slv2/slv2.h>
 #include <jack/jack.h>
 
@@ -27,14 +28,14 @@ struct JackHost {
 	jack_client_t* jack_client; /**< Jack client */
 	SLV2Plugin*    plugin;      /**< Plugin "class" (actually just a few strings) */
 	SLV2Instance*  instance;    /**< Plugin "instance" (loaded shared lib) */
-	unsigned long  num_ports;   /**< Size of the two following arrays: */
+	size_t         num_ports;   /**< Size of the two following arrays: */
 	jack_port_t**  jack_ports;  /**< For audio ports, otherwise NULL */
 	float*         controls;    /**< For control ports, otherwise 0.0f */
 };
 
 
 void die(const char* msg);
-void create_port(struct JackHost* host, unsigned long port_index);
+void create_port(struct JackHost* host, uint32_t port_index);
 int  jack_process_cb(jack_nframes_t nframes, void* data);
 void list_plugins(SLV2List list);
 
@@ -99,7 +100,7 @@ main(int argc, char** argv)
 	host.jack_ports = calloc(host.num_ports, sizeof(jack_port_t*));
 	host.controls   = calloc(host.num_ports, sizeof(float*));
 	
-	for (unsigned long i=0; i < host.num_ports; ++i)
+	for (size_t i=0; i < host.num_ports; ++i)
 		create_port(&host, i);
 	
 	/* Activate plugin and JACK */
@@ -146,10 +147,10 @@ die(const char* msg)
  */
 void
 create_port(struct JackHost* host,
-            unsigned long    port_index)
+            uint32_t         port_index)
 {
 	/* Make sure this is a float port */
-	uchar* type = slv2_port_get_data_type(host->plugin, port_index);
+	char* type = slv2_port_get_data_type(host->plugin, port_index);
 	if (strcmp(type, SLV2_DATA_TYPE_FLOAT))
 		die("Unrecognized data type, aborting.");
 	free(type);
@@ -197,7 +198,7 @@ jack_process_cb(jack_nframes_t nframes, void* data)
 	struct JackHost* host = (struct JackHost*)data;
 
 	/* Connect plugin ports directly to JACK buffers */
-	for (unsigned long i=0; i < host->num_ports; ++i)
+	for (size_t i=0; i < host->num_ports; ++i)
 		if (host->jack_ports[i] != NULL)
 			slv2_instance_connect_port(host->instance, i,
 				jack_port_get_buffer(host->jack_ports[i], nframes));
@@ -212,7 +213,7 @@ jack_process_cb(jack_nframes_t nframes, void* data)
 void
 list_plugins(SLV2List list)
 {
-	for (int i=0; i < slv2_list_get_length(list); ++i) {
+	for (size_t i=0; i < slv2_list_get_length(list); ++i) {
 		const SLV2Plugin* const p = slv2_list_get_plugin_by_index(list, i);
 		printf("%s\n", slv2_plugin_get_uri(p));
 	}
diff --git a/examples/hosts/test_host.c b/examples/hosts/test_host.c
index 16efa11..97df831 100644
--- a/examples/hosts/test_host.c
+++ b/examples/hosts/test_host.c
@@ -61,7 +61,7 @@ create_audio_output()
 void
 create_port(SLV2Plugin*   plugin,
             SLV2Instance* instance,
-            unsigned long port_index)
+            uint32_t      port_index)
 {
 	enum SLV2PortClass class = slv2_port_get_class(plugin, port_index);
 
@@ -102,14 +102,14 @@ main()
 	const SLV2Plugin* p = slv2_list_get_plugin_by_uri(plugins, plugin_uri);
 	if (p) {
 		/* Get the plugin's name */
-		unsigned char* name = slv2_plugin_get_name(p);
+		char* name = slv2_plugin_get_name(p);
 		printf("Name:\t%s\n", name);
 		free(name);
 
-		unsigned long num_ports = slv2_plugin_get_num_ports(p);
+		uint32_t num_ports = slv2_plugin_get_num_ports(p);
 		//printf("Number of ports: %ld\n", num_ports);
 
-		for (unsigned long i=0; i < num_ports; ++i) {
+		for (uint32_t i=0; i < num_ports; ++i) {
 			enum SLV2PortClass class = slv2_port_get_class(p, i);
 
 			switch (class) {
@@ -134,7 +134,7 @@ main()
 		}
 		
 		SLV2Property prop;
-		for (unsigned long i=0; i < num_ports; ++i) {
+		for (uint32_t i=0; i < num_ports; ++i) {
 			const char* property = "a";
 			prop = slv2_port_get_property(p, i, property);
 			if (prop)
@@ -167,65 +167,6 @@ main()
 	
 	slv2_list_free(plugins);
 
-#if 0
-	/* Display all plugins found in path */
-	if (plugins)
-		printf("Plugins found: %ld\n", slv2_list_get_size(plugins));
-	else
-		printf("No plugins found in %s\n", path);
-
-	for (unsigned long i=0; 1; ++i) {
-		const SLV2Plugin* p =
-			slv2_list_get_plugin_by_index(plugins, i);
-
-		if (!p)
-			break;
-		else
-			printf("\t%s\n", slv2_plugin_get_uri(p));
-	}
-#endif
-	
-#if 0
-	const uchar* bundle_url = (const uchar*)"file:/home/dave/code/ladspa2/ladspa2_sdk/examples/plugins/Amp-swh.ladspa2/";
-	LV2Bundle* b = slv2_bundle_load(bundle_url);
-
-	if (b != NULL) {
-		printf("Loaded bundle %s\n", slv2_bundle_get_url(b));
-
-		for (unsigned long i=0; i < slv2_bundle_get_num_plugins(b); ++i) {
-			const SLV2Plugin* p = slv2_bundle_get_plugin_by_index(b, i);
-			//printf("Plugin: %s\n", p->plugin_uri);
-			//printf("Lib: %s\n",    p->lib_url);
-			//printf("Data: %s\n",   p->data_url);
-			
-			printf("\n");
-			const uchar* property = (uchar*)"doap:name";
-			printf("%s\t%s\n", slv2_plugin_get_uri(p), property);
-			struct SLV2Property* result = slv2_plugin_get_property(p, property);
-			
-			if (result) {
-				for (int i=0; i < result->num_values; ++i)
-					printf("\t%s\n", result->values[i]);
-			} else {
-				printf("No results.\n");
-			}
-			printf("\n");
-
-			/* Instantiate plugin */
-			SLV2PluginInstance* instance = slv2_plugin_instantiate(
-				p, 48000, NULL);
-			if (instance != NULL) {
-				printf("Successfully instantiated %s\n", slv2_plugin_get_uri(p));
-				slv2_plugin_instance_free(instance);
-			}
-			
-		}
-
-	} else {
-		printf("Failed to load bundle %s\n", bundle_url);
-	}
-#endif
-
 	return 0;
 }