Fix LV2 UI stuff.

Sineshaper embeds in Ingen now.


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

7 files changed, 401 insertions, 15 deletions

diff --git a/slv2/pluginui.h b/slv2/pluginui.h
new file mode 100644
index 0000000..7297431
--- /dev/null
+++ b/slv2/pluginui.h
@@ -0,0 +1,87 @@
+/* SLV2
+ * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
+ *  
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __SLV2_PLUGIN_UI_H__
+#define __SLV2_PLUGIN_UI_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \defgroup ui Plugin user interfaces
+ *
+ * @{
+ */
+
+
+/** Get the URI of a Plugin UI.
+ *
+ * \param ui The Plugin UI
+ *
+ * Time = O(1)
+ */
+const char*
+slv2_plugin_ui_get_uri(SLV2PluginUI ui);
+
+
+/** Get the URI of the a Plugin UI.
+ *
+ * \param ui The Plugin UI
+ *
+ * Time = O(1)
+ */
+SLV2Values
+slv2_plugin_ui_get_types(SLV2PluginUI ui);
+
+
+/** Check whether a plugin UI is a given type.
+ *
+ * \param ui The Plugin UI
+ *
+ * Time = O(1)
+ */
+bool
+slv2_plugin_ui_is_type(SLV2PluginUI ui, const char* type_uri);
+	
+
+/** Get the URI for a Plugin UI's bundle.
+ *
+ * \param ui The Plugin UI
+ *
+ * Time = O(1)
+ */
+const char*
+slv2_plugin_ui_get_bundle_uri(SLV2PluginUI ui);
+
+
+/** Get the URI for a Plugin UI's shared library.
+ *
+ * \param ui The Plugin UI
+ *
+ * Time = O(1)
+ */
+const char*
+slv2_plugin_ui_get_binary_uri(SLV2PluginUI ui);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SLV2_PLUGIN_UI_H__ */
+
diff --git a/slv2/pluginuis.h b/slv2/pluginuis.h
new file mode 100644
index 0000000..06c38b7
--- /dev/null
+++ b/slv2/pluginuis.h
@@ -0,0 +1,91 @@
+/* SLV2
+ * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
+ *  
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __SLV2_PLUGIN_UIS_H__
+#define __SLV2_PLUGIN_UIS_H__
+
+#include <slv2/types.h>
+#include <slv2/plugin.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \defgroup plugins Collections of plugins
+ * 
+ * These functions work with lists of plugins which come from an
+ * SLV2World.  These lists contain only a weak reference to an LV2 plugin
+ * in the Model.
+ *
+ * @{
+ */
+
+
+/** Free a plugin list.
+ *
+ * Freeing a plugin list does not destroy the plugins it contains (plugins
+ * are owned by the world).  \a list is invalid after this call.
+ */
+void
+slv2_plugin_uis_free(SLV2PluginUIs list);
+
+
+/** Get the number of plugins in the list.
+ */
+unsigned
+slv2_plugin_uis_size(SLV2PluginUIs list);
+
+
+/** Get a plugin from the list by URI.
+ *
+ * Return value is shared (stored in \a list) and must not be freed or
+ * modified by the caller in any way.
+ *
+ * Time = O(log2(n))
+ * 
+ * \return NULL if plugin with \a url not found in \a list.
+ */
+SLV2PluginUI
+slv2_plugin_uis_get_by_uri(SLV2PluginUIs list,
+                           const char*   uri);
+
+
+/** Get a plugin from the list by index.
+ *
+ * \a index has no significance other than as an index into this list.
+ * Any \a index not less than slv2_list_get_length(list) will return NULL,
+ * so all plugins in a list can be enumerated by repeated calls
+ * to this function starting with \a index = 0.
+ *
+ * Time = O(1)
+ *
+ * \return NULL if \a index out of range.
+ */
+SLV2PluginUI
+slv2_plugin_uis_get_at(SLV2PluginUIs list,
+                       unsigned      index);
+
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SLV2_PLUGIN_UIS_H__ */
+
diff --git a/slv2/value.h b/slv2/value.h
index d3ea1c4..0d8f9dc 100644
--- a/slv2/value.h
+++ b/slv2/value.h
@@ -31,6 +31,10 @@ extern "C" {
  */
 
 
+/*SLV2Value
+slv2_value_new_uri(const char* uri);*/
+
+
 /** Free an SLV2Value.
  */
 void
diff --git a/src/pluginui.c b/src/pluginui.c
new file mode 100644
index 0000000..ed9eec5
--- /dev/null
+++ b/src/pluginui.c
@@ -0,0 +1,115 @@
+/* SLV2
+ * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
+ *  
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#define _XOPEN_SOURCE 500
+
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+#include <slv2/values.h>
+#include "slv2_internal.h"
+
+
+/* private */
+SLV2PluginUI
+slv2_plugin_ui_new(SLV2World   world,
+                   librdf_uri* uri,
+                   librdf_uri* type_uri,
+                   librdf_uri* binary_uri)
+{
+	struct _SLV2PluginUI* ui = malloc(sizeof(struct _SLV2PluginUI));
+	ui->uri = librdf_new_uri_from_uri(uri);
+	ui->binary_uri = librdf_new_uri_from_uri(binary_uri);
+	
+	// FIXME: kludge
+	char* bundle = strdup((const char*)librdf_uri_as_string(ui->binary_uri));
+	char* last_slash = strrchr(bundle, '/') + 1;
+	*last_slash = '\0';
+	ui->bundle_uri = librdf_new_uri(world->world, (const unsigned char*)bundle);
+	free(bundle);
+
+	ui->types = slv2_values_new();
+	raptor_sequence_push(ui->types, slv2_value_new(SLV2_VALUE_URI,
+				(const char*)librdf_uri_as_string(type_uri)));
+
+	return ui;
+}
+
+
+/* private */
+void
+slv2_plugin_ui_free(SLV2PluginUI ui)
+{
+	librdf_free_uri(ui->uri);
+	ui->uri = NULL;
+	
+	librdf_free_uri(ui->bundle_uri);
+	ui->bundle_uri = NULL;
+	
+	librdf_free_uri(ui->binary_uri);
+	ui->binary_uri = NULL;
+
+	slv2_values_free(ui->types);
+	
+	free(ui);
+}
+
+
+const char*
+slv2_plugin_ui_get_uri(SLV2PluginUI ui)
+{
+	assert(ui);
+	assert(ui->uri);
+	return (const char*)librdf_uri_as_string(ui->uri);
+}
+
+
+SLV2Values
+slv2_plugin_ui_get_types(SLV2PluginUI ui)
+{
+	return ui->types;
+}
+
+
+bool
+slv2_plugin_ui_is_type(SLV2PluginUI ui, const char* type_uri)
+{
+	SLV2Value type = slv2_value_new(SLV2_VALUE_URI, type_uri);
+	bool ret = slv2_values_contains(ui->types, type);
+	slv2_value_free(type);
+	return ret;
+}
+
+
+const char*
+slv2_plugin_ui_get_bundle_uri(SLV2PluginUI ui)
+{
+	assert(ui);
+	assert(ui->bundle_uri);
+	return (const char*)librdf_uri_as_string(ui->bundle_uri);
+}
+
+
+const char*
+slv2_plugin_ui_get_binary_uri(SLV2PluginUI ui)
+{
+	assert(ui);
+	assert(ui->binary_uri);
+	return (const char*)librdf_uri_as_string(ui->binary_uri);
+}
+
diff --git a/src/pluginuiinstance.c b/src/pluginuiinstance.c
index be06217..60a3267 100644
--- a/src/pluginuiinstance.c
+++ b/src/pluginuiinstance.c
@@ -26,6 +26,7 @@
 #include <dlfcn.h>
 #include <slv2/types.h>
 #include <slv2/plugin.h>
+#include <slv2/pluginui.h>
 #include <slv2/pluginuiinstance.h>
 #include <slv2/util.h>
 #include "slv2_internal.h"
@@ -41,12 +42,6 @@ slv2_plugin_ui_instantiate(SLV2Plugin                     plugin,
                            LV2UI_Controller               controller,
                            const LV2_Host_Feature* const* host_features)
 {
-#if 0
-	assert(ui->type == SLV2_VALUE_UI);
-
-	if (ui->val.ui_type_val != SLV2_UI_TYPE_GTK2)
-		return NULL;
-
 	struct _SLV2UIInstance* result = NULL;
 	
 	bool local_host_features = (host_features == NULL);
@@ -55,7 +50,7 @@ slv2_plugin_ui_instantiate(SLV2Plugin                     plugin,
 		((LV2_Host_Feature**)host_features)[0] = NULL;
 	}
 	
-	const char* const lib_uri = slv2_value_as_uri(slv2_plugin_get_ui_library_uri(plugin, ui));
+	const char* const lib_uri = slv2_plugin_ui_get_binary_uri(ui);
 	const char* const lib_path = slv2_uri_to_path(lib_uri);
 	
 	if (!lib_path)
@@ -76,11 +71,8 @@ slv2_plugin_ui_instantiate(SLV2Plugin                     plugin,
 		dlclose(lib);
 		return NULL;
 	} else {
-		// Search for plugin by URI
 		
-		// FIXME: Bundle in plugin UI only, boo
-		const char* bundle_path = slv2_uri_to_path(slv2_plugin_get_bundle_uri(plugin));
-		printf("UI bundle path: %s\n", bundle_path);
+		const char* bundle_path = slv2_uri_to_path(slv2_plugin_ui_get_bundle_uri(ui));
 		
 		for (uint32_t i=0; 1; ++i) {
 			
@@ -88,10 +80,10 @@ slv2_plugin_ui_instantiate(SLV2Plugin                     plugin,
 				
 			if (!ld) {
 				fprintf(stderr, "Did not find UI %s in %s\n",
-						slv2_value_as_uri(ui), lib_path);
+						slv2_plugin_ui_get_uri(ui), lib_path);
 				dlclose(lib);
 				break; // return NULL
-			} else if (!strcmp(ld->URI, slv2_value_as_uri(ui))) {
+			} else if (!strcmp(ld->URI, slv2_plugin_ui_get_uri(ui))) {
 
 				printf("Found UI %s at index %u in:\n\t%s\n\n",
 				       librdf_uri_as_string(plugin->plugin_uri), i, lib_path);
@@ -140,8 +132,6 @@ slv2_plugin_ui_instantiate(SLV2Plugin                     plugin,
 		free((LV2_Host_Feature**)host_features);
 
 	return result;
-#endif
-	return NULL;
 }
 
 
diff --git a/src/pluginuis.c b/src/pluginuis.c
new file mode 100644
index 0000000..6e0f77f
--- /dev/null
+++ b/src/pluginuis.c
@@ -0,0 +1,91 @@
+/* SLV2
+ * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
+ *  
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#define _XOPEN_SOURCE 500
+#include <string.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <librdf.h>
+#include <slv2/types.h>
+#include <slv2/pluginuis.h>
+#include <slv2/pluginui.h>
+#include <slv2/util.h>
+#include "slv2_internal.h"
+
+	
+SLV2PluginUIs
+slv2_plugin_uis_new()
+{
+	return raptor_new_sequence((void (*)(void*))&slv2_plugin_ui_free, NULL);
+	//return raptor_new_sequence(NULL, NULL);
+}
+
+
+void
+slv2_plugin_uis_free(SLV2PluginUIs list)
+{
+	raptor_free_sequence(list);
+}
+
+
+unsigned
+slv2_plugin_uis_size(SLV2PluginUIs list)
+{
+	return raptor_sequence_size(list);
+}
+
+
+SLV2PluginUI
+slv2_plugin_uis_get_by_uri(SLV2PluginUIs list, const char* uri)
+{
+	// good old fashioned binary search
+	
+	int lower = 0;
+	int upper = raptor_sequence_size(list) - 1;
+	int i;
+	
+	while (upper >= lower) {
+		i = lower + ((upper - lower) / 2);
+
+		SLV2PluginUI ui = raptor_sequence_get_at(list, i);
+
+		int cmp = strcmp(slv2_plugin_ui_get_uri(ui), uri);
+
+		if (cmp == 0)
+			return ui;
+		else if (cmp > 0)
+			upper = i - 1;
+		else
+			lower = i + 1;
+	}
+
+	return NULL;
+}
+
+
+SLV2PluginUI
+slv2_plugin_uis_get_at(SLV2PluginUIs list, unsigned index)
+{	
+	if (index > INT_MAX)
+		return NULL;
+	else
+		return (SLV2PluginUI)raptor_sequence_get_at(list, (int)index);
+}
+
diff --git a/src/value.c b/src/value.c
index 33f0020..bccb375 100644
--- a/src/value.c
+++ b/src/value.c
@@ -50,6 +50,14 @@ slv2_value_new(SLV2ValueType type, const char* str)
 }
 
 
+/*
+SLV2Value
+slv2_value_new_uri(const char* uri)
+{
+	return slv2_value_new(SLV2_VALUE_URI, uri);
+}
+*/
+
 SLV2Value
 slv2_value_duplicate(SLV2Value val)
 {