diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/pluginui.c | 115 | ||||
-rw-r--r-- | src/pluginuiinstance.c | 20 | ||||
-rw-r--r-- | src/pluginuis.c | 91 | ||||
-rw-r--r-- | src/value.c | 8 |
4 files changed, 219 insertions, 15 deletions
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) { |