diff options
| -rw-r--r-- | slv2/slv2.h | 4 | ||||
| -rw-r--r-- | src/pluginuiinstance.c | 12 | ||||
| -rw-r--r-- | src/slv2_internal.h | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/slv2/slv2.h b/slv2/slv2.h index dc47347..61af2e4 100644 --- a/slv2/slv2.h +++ b/slv2/slv2.h @@ -1337,8 +1337,7 @@ typedef uint32_t (*SLV2PortUnsubscribeFunction)(LV2UI_Controller controller, */ SLV2_API SLV2UIHost -slv2_ui_host_new(LV2UI_Controller controller, - LV2UI_Write_Function write_function, +slv2_ui_host_new(LV2UI_Write_Function write_function, SLV2PortIndexFunction port_index_function, SLV2PortSubscribeFunction port_subscribe_function, SLV2PortUnsubscribeFunction port_unsubscribe_function); @@ -1374,6 +1373,7 @@ slv2_ui_instance_new(SLV2Plugin plugin, SLV2UI ui, SLV2Value widget_type_uri, SLV2UIHost ui_host, + LV2UI_Controller controller, const LV2_Feature* const* features); /** diff --git a/src/pluginuiinstance.c b/src/pluginuiinstance.c index e805961..2c7b60f 100644 --- a/src/pluginuiinstance.c +++ b/src/pluginuiinstance.c @@ -45,11 +45,10 @@ slv2_ui_instantiate(SLV2Plugin plugin, LV2UI_Controller controller, const LV2_Feature* const* features) { - SLV2UIHost ui_host = slv2_ui_host_new( - controller, write_function, NULL, NULL, NULL); + SLV2UIHost ui_host = slv2_ui_host_new(write_function, NULL, NULL, NULL); SLV2UIInstance ret = slv2_ui_instance_new( - plugin, ui, NULL, ui_host, features); + plugin, ui, NULL, ui_host, controller, features); slv2_ui_host_free(ui_host); return ret; @@ -57,14 +56,12 @@ slv2_ui_instantiate(SLV2Plugin plugin, SLV2_API SLV2UIHost -slv2_ui_host_new(LV2UI_Controller controller, - LV2UI_Write_Function write_function, +slv2_ui_host_new(LV2UI_Write_Function write_function, SLV2PortIndexFunction port_index_function, SLV2PortSubscribeFunction port_subscribe_function, SLV2PortUnsubscribeFunction port_unsubscribe_function) { SLV2UIHost ret = malloc(sizeof(struct _SLV2UIHost)); - ret->controller = controller; ret->write_function = write_function; ret->port_index_function = port_index_function; ret->port_subscribe_function = port_subscribe_function; @@ -85,6 +82,7 @@ slv2_ui_instance_new(SLV2Plugin plugin, SLV2UI ui, SLV2Value widget_type_uri, SLV2UIHost ui_host, + LV2UI_Controller controller, const LV2_Feature* const* features) { #ifdef HAVE_SUIL @@ -109,7 +107,7 @@ slv2_ui_instance_new(SLV2Plugin plugin, slv2_value_as_uri(ui_type), slv2_value_as_uri(widget_type_uri), ui_host->write_function, - ui_host->controller, + controller, features); if (!suil_instance) { diff --git a/src/slv2_internal.h b/src/slv2_internal.h index 97f141f..a3b4f1e 100644 --- a/src/slv2_internal.h +++ b/src/slv2_internal.h @@ -159,7 +159,6 @@ struct _SLV2UIInstance { }; struct _SLV2UIHost { - LV2UI_Controller controller; LV2UI_Write_Function write_function; SLV2PortIndexFunction port_index_function; SLV2PortSubscribeFunction port_subscribe_function; |