From 3f09b87f2a1d6d0b6c913be7e95ce58b2d5ec80b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 28 Apr 2011 00:40:03 +0000 Subject: Don't hide pointers behind typedefs. git-svn-id: http://svn.drobilla.net/lad/trunk/suil@3203 a436a847-0d15-0410-975c-d299462d15a1 --- src/instance.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) (limited to 'src/instance.c') diff --git a/src/instance.c b/src/instance.c index 5baa06a..d619d74 100644 --- a/src/instance.c +++ b/src/instance.c @@ -115,8 +115,8 @@ get_wrap_module(const char* container_type_uri, } SUIL_API -SuilInstance -suil_instance_new(SuilHost host, +SuilInstance* +suil_instance_new(SuilHost* host, SuilController controller, const char* container_type_uri, const char* plugin_uri, @@ -174,7 +174,7 @@ suil_instance_new(SuilHost host, } // Instantiate UI - struct _SuilInstance* instance = malloc(sizeof(struct _SuilInstance)); + SuilInstance* instance = malloc(sizeof(struct SuilInstanceImpl)); instance->lib_handle = lib; instance->descriptor = descriptor; instance->host_widget = NULL; @@ -221,7 +221,7 @@ suil_instance_new(SuilHost host, SUIL_API void -suil_instance_free(SuilInstance instance) +suil_instance_free(SuilInstance* instance) { if (instance) { instance->descriptor->cleanup(instance->handle); @@ -230,34 +230,20 @@ suil_instance_free(SuilInstance instance) } } -SUIL_API -const LV2UI_Descriptor* -suil_instance_get_descriptor(SuilInstance instance) -{ - return instance->descriptor; -} - -SUIL_API -LV2UI_Handle -suil_instance_get_handle(SuilInstance instance) -{ - return instance->handle; -} - SUIL_API LV2UI_Widget -suil_instance_get_widget(SuilInstance instance) +suil_instance_get_widget(SuilInstance* instance) { return instance->host_widget; } SUIL_API void -suil_instance_port_event(SuilInstance instance, - uint32_t port_index, - uint32_t buffer_size, - uint32_t format, - const void* buffer) +suil_instance_port_event(SuilInstance* instance, + uint32_t port_index, + uint32_t buffer_size, + uint32_t format, + const void* buffer) { instance->descriptor->port_event(instance->handle, port_index, @@ -268,8 +254,8 @@ suil_instance_port_event(SuilInstance instance, SUIL_API const void* -suil_instance_extension_data(SuilInstance instance, - const char* uri) +suil_instance_extension_data(SuilInstance* instance, + const char* uri) { return instance->descriptor->extension_data(uri); } -- cgit v1.2.1