From 361f21b9e1f59bd602d0e1ed8b80f726605995be Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 24 Jan 2008 16:11:18 +0000 Subject: Make SLV2 UI class interface match ports. git-svn-id: http://svn.drobilla.net/lad/slv2@1112 a436a847-0d15-0410-975c-d299462d15a1 --- slv2/pluginui.h | 4 ++-- src/pluginui.c | 14 +++++++------- src/slv2_internal.h | 2 +- utils/lv2_inspect.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/slv2/pluginui.h b/slv2/pluginui.h index 7de54aa..b01bf34 100644 --- a/slv2/pluginui.h +++ b/slv2/pluginui.h @@ -45,7 +45,7 @@ slv2_ui_get_uri(SLV2UI ui); * Time = O(1) */ SLV2Values -slv2_ui_get_types(SLV2UI ui); +slv2_ui_get_classes(SLV2UI ui); /** Check whether a plugin UI is a given type. @@ -56,7 +56,7 @@ slv2_ui_get_types(SLV2UI ui); * Time = O(1) */ bool -slv2_ui_is_type(SLV2UI ui, const char* type_uri); +slv2_ui_is_a(SLV2UI ui, const char* type_uri); /** Get the URI for a Plugin UI's bundle. diff --git a/src/pluginui.c b/src/pluginui.c index 01f512a..5de3dcb 100644 --- a/src/pluginui.c +++ b/src/pluginui.c @@ -50,8 +50,8 @@ slv2_ui_new(SLV2World world, 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_librdf_uri(world, type_uri)); + ui->classes = slv2_values_new(); + raptor_sequence_push(ui->classes, slv2_value_new_librdf_uri(world, type_uri)); return ui; } @@ -70,7 +70,7 @@ slv2_ui_free(SLV2UI ui) librdf_free_uri(ui->binary_uri); ui->binary_uri = NULL; - slv2_values_free(ui->types); + slv2_values_free(ui->classes); free(ui); } @@ -86,17 +86,17 @@ slv2_ui_get_uri(SLV2UI ui) SLV2Values -slv2_ui_get_types(SLV2UI ui) +slv2_ui_get_classes(SLV2UI ui) { - return ui->types; + return ui->classes; } bool -slv2_ui_is_type(SLV2UI ui, const char* type_uri) +slv2_ui_is_a(SLV2UI ui, const char* type_uri) { SLV2Value type = slv2_value_new(ui->world, SLV2_VALUE_URI, type_uri); - bool ret = slv2_values_contains(ui->types, type); + bool ret = slv2_values_contains(ui->classes, type); slv2_value_free(type); return ret; } diff --git a/src/slv2_internal.h b/src/slv2_internal.h index 40677e7..06c432d 100644 --- a/src/slv2_internal.h +++ b/src/slv2_internal.h @@ -178,7 +178,7 @@ struct _SLV2UI { librdf_uri* uri; librdf_uri* bundle_uri; librdf_uri* binary_uri; - SLV2Values types; + SLV2Values classes; }; SLV2UIs slv2_uis_new(); diff --git a/utils/lv2_inspect.c b/utils/lv2_inspect.c index cf532c6..eda6d8a 100644 --- a/utils/lv2_inspect.c +++ b/utils/lv2_inspect.c @@ -113,9 +113,9 @@ print_plugin(SLV2Plugin p) const char* binary = slv2_ui_get_binary_uri(ui); - SLV2Values types = slv2_ui_get_types(ui); + SLV2Values types = slv2_ui_get_classes(ui); for (unsigned i=0; i < slv2_values_size(types); ++i) { - printf("\t\t\tType: %s\n", slv2_value_as_uri(slv2_values_get_at(types, i))); + printf("\t\t\tClass: %s\n", slv2_value_as_uri(slv2_values_get_at(types, i))); } if (binary) -- cgit v1.2.1