From f133ff81139580a7b73bb09d61644d0b71be2693 Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Sat, 16 Jul 2022 11:31:44 +0200 Subject: [PATCH] remove deprecated ui:resize feature/extension --- VERSION | 2 +- sherlock_nk.c | 23 +++-------------------- sherlock_ui.ttl | 12 ++++++------ 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/VERSION b/VERSION index f95b087..f81fc79 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.29.7 +0.29.7 cut -d. -f1.1.9 diff --git a/sherlock_nk.c b/sherlock_nk.c index dac47c1..c8145fb 100644 --- a/sherlock_nk.c +++ b/sherlock_nk.c @@ -282,7 +282,6 @@ instantiate(const LV2UI_Descriptor *descriptor __attribute__((unused)), return NULL; void *parent = NULL; - LV2UI_Resize *host_resize = NULL; LV2_Options_Option *opts = NULL; for(int i=0; features[i]; i++) { @@ -298,10 +297,6 @@ instantiate(const LV2UI_Descriptor *descriptor __attribute__((unused)), { 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_OPTIONS__options)) { opts = features[i]->data; @@ -369,7 +364,7 @@ instantiate(const LV2UI_Descriptor *descriptor __attribute__((unused)), cfg->class = "sherlock_inspector"; cfg->title = "Sherlock Inspector"; cfg->parent = (intptr_t)parent; - cfg->host_resize = host_resize; + cfg->host_resize = NULL; cfg->data = handle; if(!strcmp(plugin_uri, SHERLOCK_MIDI_INSPECTOR_URI)) { @@ -643,25 +638,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/sherlock_ui.ttl b/sherlock_ui.ttl index bee47b0..be913e2 100644 --- a/sherlock_ui.ttl +++ b/sherlock_ui.ttl @@ -32,8 +32,8 @@ sherlock:atom_inspector_4_nk atom:Tuple ; ui:protocol atom:eventTransfer ] ; - lv2:extensionData ui:idleInterface, ui:resize ; - lv2:optionalFeature ui:resize, opts:options ; + lv2:extensionData ui:idleInterface ; + lv2:optionalFeature opts:options ; opts:supportedOption ui:scaleFactor ; lv2:requiredFeature ui:idleInterface, urid:map, urid:unmap, ui:parent . @@ -46,8 +46,8 @@ sherlock:midi_inspector_4_nk atom:Tuple ; ui:protocol atom:eventTransfer ] ; - lv2:extensionData ui:idleInterface, ui:resize ; - lv2:optionalFeature ui:resize, opts:options ; + lv2:extensionData ui:idleInterface ; + lv2:optionalFeature opts:options ; opts:supportedOption ui:scaleFactor ; lv2:requiredFeature ui:idleInterface, urid:map, urid:unmap, ui:parent . @@ -60,7 +60,7 @@ sherlock:osc_inspector_4_nk atom:Tuple ; ui:protocol atom:eventTransfer ] ; - lv2:extensionData ui:idleInterface, ui:resize ; - lv2:optionalFeature ui:resize, opts:options ; + lv2:extensionData ui:idleInterface ; + lv2:optionalFeature opts:options ; opts:supportedOption ui:scaleFactor ; lv2:requiredFeature ui:idleInterface, urid:map, urid:unmap, ui:parent . -- 2.38.5