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/gtk2_in_qt4.cpp | 6 +++--- src/host.c | 6 +++--- src/instance.c | 38 ++++++++++++-------------------------- src/qt4_in_gtk2.cpp | 8 ++++---- src/suil_internal.h | 10 +++++----- suil/suil.h | 30 +++++++++++++++--------------- 6 files changed, 42 insertions(+), 56 deletions(-) diff --git a/src/gtk2_in_qt4.cpp b/src/gtk2_in_qt4.cpp index 5c50928..844e45b 100644 --- a/src/gtk2_in_qt4.cpp +++ b/src/gtk2_in_qt4.cpp @@ -37,9 +37,9 @@ suil_wrap_init(const char* host_type_uri, /** Dynamic module entry point. */ SUIL_API int -suil_wrap(const char* host_type_uri, - const char* ui_type_uri, - SuilInstance instance) +suil_wrap(const char* host_type_uri, + const char* ui_type_uri, + SuilInstance* instance) { GtkWidget* const plug = gtk_plug_new(0); GtkWidget* const widget = (GtkWidget*)instance->ui_widget; diff --git a/src/host.c b/src/host.c index 4709b14..48b0b6a 100644 --- a/src/host.c +++ b/src/host.c @@ -17,13 +17,13 @@ #include "suil_internal.h" SUIL_API -SuilHost +SuilHost* suil_host_new(SuilPortWriteFunc write_func, SuilPortIndexFunc index_func, SuilPortSubscribeFunc subscribe_func, SuilPortUnsubscribeFunc unsubscribe_func) { - SuilHost host = malloc(sizeof(struct _SuilHost)); + SuilHost* host = malloc(sizeof(struct SuilHostImpl)); host->write_func = write_func; host->index_func = index_func; host->subscribe_func = subscribe_func; @@ -33,7 +33,7 @@ suil_host_new(SuilPortWriteFunc write_func, SUIL_API void -suil_host_free(SuilHost host) +suil_host_free(SuilHost* host) { free(host); } 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); } diff --git a/src/qt4_in_gtk2.cpp b/src/qt4_in_gtk2.cpp index a940fcf..e056b65 100644 --- a/src/qt4_in_gtk2.cpp +++ b/src/qt4_in_gtk2.cpp @@ -62,7 +62,7 @@ GType wrap_widget_get_type(void); // Accessor for GTK_TYPE_WIDGET struct _WrapWidgetPrivate { QX11EmbedWidget* qembed; - SuilInstance instance; + SuilInstance* instance; }; G_DEFINE_TYPE(WrapWidget, wrap_widget, GTK_TYPE_SOCKET); @@ -116,9 +116,9 @@ wrap_widget_realize(GtkWidget* w, gpointer data) SUIL_API int -suil_wrap(const char* host_type_uri, - const char* ui_type_uri, - SuilInstance instance) +suil_wrap(const char* host_type_uri, + const char* ui_type_uri, + SuilInstance* instance) { WrapWidget* const wrap = WRAP_WIDGET(g_object_new(WRAP_TYPE_WIDGET, NULL)); diff --git a/src/suil_internal.h b/src/suil_internal.h index be167cd..53ee0a8 100644 --- a/src/suil_internal.h +++ b/src/suil_internal.h @@ -37,14 +37,14 @@ static inline char* dlerror(void) { return "Unknown error"; } #define SUIL_ERRORF(fmt, ...) fprintf(stderr, "error: %s: " fmt, \ __func__, __VA_ARGS__) -struct _SuilHost { +struct SuilHostImpl { SuilPortWriteFunc write_func; SuilPortIndexFunc index_func; SuilPortSubscribeFunc subscribe_func; SuilPortUnsubscribeFunc unsubscribe_func; }; -struct _SuilInstance { +struct SuilInstanceImpl { void* lib_handle; const LV2UI_Descriptor* descriptor; LV2UI_Handle handle; @@ -61,9 +61,9 @@ typedef int (*SuilWrapInitFunc)(const char* host_type_uri, const char* ui_type_uri, const LV2_Feature* const* features); -typedef int (*SuilWrapFunc)(const char* host_type_uri, - const char* ui_type_uri, - SuilInstance instance); +typedef int (*SuilWrapFunc)(const char* host_type_uri, + const char* ui_type_uri, + SuilInstance* instance); typedef void (*SuilVoidFunc)(); diff --git a/suil/suil.h b/suil/suil.h index 93c9ed3..7951d42 100644 --- a/suil/suil.h +++ b/suil/suil.h @@ -60,10 +60,10 @@ extern "C" { with the plugin. It is passed to @ref suil_instance_new to provide these functions to the UI. */ -typedef struct _SuilHost* SuilHost; +typedef struct SuilHostImpl SuilHost; /** An instance of an LV2 plugin UI. */ -typedef struct _SuilInstance* SuilInstance; +typedef struct SuilInstanceImpl SuilInstance; /** Opaque pointer to a UI widget. */ typedef void* SuilWidget; @@ -110,7 +110,7 @@ typedef uint32_t (*SuilPortUnsubscribeFunc)(SuilController controller @param unsubscribe_func Function to unsubscribe from port updates. */ SUIL_API -SuilHost +SuilHost* suil_host_new(SuilPortWriteFunc write_func, SuilPortIndexFunc index_func, SuilPortSubscribeFunc subscribe_func, @@ -121,7 +121,7 @@ suil_host_new(SuilPortWriteFunc write_func, */ SUIL_API void -suil_host_free(SuilHost host); +suil_host_free(SuilHost* host); /** Check if suil can wrap a UI type. @@ -152,8 +152,8 @@ suil_ui_supported(const char* host_type_uri, @return A new UI instance, or NULL if instantiation failed. */ 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, @@ -171,7 +171,7 @@ suil_instance_new(SuilHost host, */ SUIL_API void -suil_instance_free(SuilInstance instance); +suil_instance_free(SuilInstance* instance); /** Get the widget for a UI instance. @@ -183,26 +183,26 @@ suil_instance_free(SuilInstance instance); */ SUIL_API SuilWidget -suil_instance_get_widget(SuilInstance instance); +suil_instance_get_widget(SuilInstance* instance); /** Notify the UI about a change in a plugin port. */ 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); /** Return a data structure defined by some LV2 extension URI. */ SUIL_API const void* -suil_instance_extension_data(SuilInstance instance, - const char* uri); +suil_instance_extension_data(SuilInstance* instance, + const char* uri); /** @} -- cgit v1.2.1