From 2cf10edab04a3a84421825f12e481f20aa8f8265 Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Sat, 16 Jul 2022 11:37:12 +0200 Subject: [PATCH] remove deprecated ui:resize feature/extension --- VERSION | 2 +- tracker_sequencer_ui.c | 26 +------------------------- tracker_tracker_ui.c | 23 +++-------------------- tracker_ui.ttl | 8 ++++---- 4 files changed, 9 insertions(+), 50 deletions(-) diff --git a/VERSION b/VERSION index 39e3403..cdddf74 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.3579 +0.1.3579 cut -d. -f1.1.3581 diff --git a/tracker_sequencer_ui.c b/tracker_sequencer_ui.c index 2680120..3b3882d 100644 --- a/tracker_sequencer_ui.c +++ b/tracker_sequencer_ui.c @@ -693,14 +693,11 @@ instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, return NULL; void *parent = NULL; - LV2UI_Resize *host_resize = NULL; LV2_Options_Option *opts = NULL; for(int i=0; features[i]; i++) { if(!strcmp(features[i]->URI, LV2_UI__parent)) parent = features[i]->data; - else if(!strcmp(features[i]->URI, LV2_UI__resize)) - host_resize = features[i]->data; else if(!strcmp(features[i]->URI, LV2_URID__map)) handle->map = features[i]->data; else if(!strcmp(features[i]->URI, LV2_URID__unmap)) @@ -790,11 +787,6 @@ instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, return NULL; } - if(host_resize) - { - host_resize->ui_resize(host_resize->handle, w, h); - } - //FIXME handle->state.offset = 1; handle->state.repeats = 0; @@ -858,18 +850,6 @@ static const LV2UI_Idle_Interface idle_ext = { .idle = _idle }; -static int -_resize(LV2UI_Handle instance, int width, int height) -{ - plughandle_t *handle = instance; - - return d2tk_frontend_set_size(handle->dpugl, width, height); -} - -static const LV2UI_Resize resize_ext = { - .ui_resize = _resize -}; - static const void * extension_data(const char *uri) { @@ -877,11 +857,7 @@ extension_data(const char *uri) { return &idle_ext; } - else if(!strcmp(uri, LV2_UI__resize)) - { - return &resize_ext; - } - + return NULL; } diff --git a/tracker_tracker_ui.c b/tracker_tracker_ui.c index 9da4df7..49b52f3 100644 --- a/tracker_tracker_ui.c +++ b/tracker_tracker_ui.c @@ -1056,7 +1056,6 @@ instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, return NULL; void *parent = NULL; - LV2UI_Resize *host_resize = NULL; LV2_Options_Option *opts = NULL; for(int i=0; features[i]; i++) { @@ -1064,10 +1063,6 @@ instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, { parent = features[i]->data; } - else if(!strcmp(features[i]->URI, LV2_UI__resize)) - { - host_resize = features[i]->data; - } else if(!strcmp(features[i]->URI, LV2_URID__map)) { handle->map = features[i]->data; @@ -1158,7 +1153,7 @@ instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, cfg->class = "tracker"; cfg->title = "Tracker"; cfg->parent = (intptr_t)parent; - cfg->host_resize = host_resize; + cfg->host_resize = NULL; cfg->data = handle; cfg->expose = _expose; @@ -1316,25 +1311,13 @@ static const LV2UI_Idle_Interface idle_ext = { .idle = _idle }; -static int -_resize(LV2UI_Handle instance, int width, int height) -{ - plughandle_t *handle = instance; - - return nk_pugl_resize(&handle->win, width, height); -} - -static const LV2UI_Resize resize_ext = { - .ui_resize = _resize -}; - static const void * extension_data(const char *uri) { if(!strcmp(uri, LV2_UI__idleInterface)) + { return &idle_ext; - else if(!strcmp(uri, LV2_UI__resize)) - return &resize_ext; + } return NULL; } diff --git a/tracker_ui.ttl b/tracker_ui.ttl index 5447c42..edfb653 100644 --- a/tracker_ui.ttl +++ b/tracker_ui.ttl @@ -30,9 +30,9 @@ tracker:tracker_ui ui:protocol atom:eventTransfer ] ; lv2:requiredFeature ui:idleInterface, urid:map, urid:unmap, opts:options, ui:parent ; - lv2:optionalFeature log:log, ui:resize ; + lv2:optionalFeature log:log ; opts:supportedOption ui:scaleFactor ; - lv2:extensionData ui:idleInterface, ui:resize . + lv2:extensionData ui:idleInterface . tracker:sequencer_ui ui:portNotification [ @@ -41,6 +41,6 @@ tracker:sequencer_ui ui:protocol atom:eventTransfer ] ; lv2:requiredFeature ui:idleInterface, urid:map, urid:unmap, opts:options, ui:parent ; - lv2:optionalFeature log:log, ui:resize ; - lv2:extensionData ui:idleInterface, ui:resize . + lv2:optionalFeature log:log ; + lv2:extensionData ui:idleInterface . #opts:requiredOption param:sampleRate . -- 2.38.5