From f71fdd414382f6ca4e6347e45b284d336538c66b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 14 Jul 2016 21:26:31 +0200 Subject: clean up a-comp, remove old prototype UI --- libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in | 3 - libs/plugins/a-comp.lv2/a-comp.c | 2 +- libs/plugins/a-comp.lv2/a-comp.ttl.in | 3 - libs/plugins/a-comp.lv2/manifest.ttl.in | 6 -- libs/plugins/a-comp.lv2/ui.cc | 119 --------------------------- libs/plugins/a-comp.lv2/wscript | 12 --- 6 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 libs/plugins/a-comp.lv2/ui.cc diff --git a/libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in b/libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in index a7f6d9b7a4..16d7a752bf 100644 --- a/libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in +++ b/libs/plugins/a-comp.lv2/a-comp#stereo.ttl.in @@ -3,7 +3,6 @@ @prefix lv2: . @prefix rdfs: . @prefix rsz: . -@prefix ui: . @prefix unit: . @@ -152,7 +151,5 @@ A powerful stereo compressor. doap:license "GPL v2+" ; doap:maintainer -# ui:ui ; - lv2:microVersion 1 ; lv2:minorVersion 1 . diff --git a/libs/plugins/a-comp.lv2/a-comp.c b/libs/plugins/a-comp.lv2/a-comp.c index 4456a4f63d..616bee5956 100644 --- a/libs/plugins/a-comp.lv2/a-comp.c +++ b/libs/plugins/a-comp.lv2/a-comp.c @@ -623,7 +623,7 @@ render_inline (LV2_Handle instance, uint32_t w, uint32_t max_h) // maybe cut off at x-position? const float x = w * (self->v_lvl_in + 60) / 60.f; - const float y = h * (self->v_lvl_out + 60) / 60.f; + //const float y = h * (self->v_lvl_out + 60) / 60.f; cairo_rectangle (cr, 0, h - x, x, h); if (self->v_ratio > 1.0) { cairo_set_source (cr, pat); diff --git a/libs/plugins/a-comp.lv2/a-comp.ttl.in b/libs/plugins/a-comp.lv2/a-comp.ttl.in index 312d0b222f..da269c7ef5 100644 --- a/libs/plugins/a-comp.lv2/a-comp.ttl.in +++ b/libs/plugins/a-comp.lv2/a-comp.ttl.in @@ -3,7 +3,6 @@ @prefix lv2: . @prefix rdfs: . @prefix rsz: . -@prefix ui: . @prefix unit: . @@ -140,7 +139,5 @@ A powerful mono compressor. doap:license ; doap:maintainer -# ui:ui ; - lv2:microVersion 1 ; lv2:minorVersion 1 . diff --git a/libs/plugins/a-comp.lv2/manifest.ttl.in b/libs/plugins/a-comp.lv2/manifest.ttl.in index de71199617..6275985cd1 100644 --- a/libs/plugins/a-comp.lv2/manifest.ttl.in +++ b/libs/plugins/a-comp.lv2/manifest.ttl.in @@ -1,7 +1,6 @@ @prefix lv2: . @prefix rdfs: . @prefix pset: . -@prefix ui: . a lv2:Plugin ; @@ -13,11 +12,6 @@ lv2:binary ; rdfs:seeAlso . -# -# a ui:GtkUI ; -# ui:binary ; -# rdfs:seeAlso . - a pset:Preset ; lv2:appliesTo ; diff --git a/libs/plugins/a-comp.lv2/ui.cc b/libs/plugins/a-comp.lv2/ui.cc deleted file mode 100644 index 5d257aec2e..0000000000 --- a/libs/plugins/a-comp.lv2/ui.cc +++ /dev/null @@ -1,119 +0,0 @@ -/* a-comp UI -- test/example - * - * Copyright (C) 2016 Robin Gareus - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#define ACOMP_URI "urn:ardour:a-comp" - -#include - -#include - -#include "lv2/lv2plug.in/ns/extensions/ui/ui.h" - -using namespace Gtk; - -typedef struct { - LV2UI_Write_Function write; - LV2UI_Controller controller; - - Box* box; - Label* label; -} ACompUI; - - -/****************************************************************************** - * GUI - */ - -static void* setup_ui (ACompUI* ui) { - ui->box = manage (new HBox); - - ui->label = manage (new Label ("Hello World")); - ui->box->pack_start (*ui->label, false, false, 4); - - return ui->box->gobj (); -} - - -/****************************************************************************** - * LV2 callbacks - */ - -static LV2UI_Handle -instantiate (const LV2UI_Descriptor* descriptor, - const char* plugin_uri, - const char* bundle_path, - LV2UI_Write_Function write_function, - LV2UI_Controller controller, - LV2UI_Widget* widget, - const LV2_Feature* const* features) -{ - ACompUI* ui = (ACompUI*)calloc (1, sizeof (ACompUI)); - ui->write = write_function; - ui->controller = controller; - ui->box = NULL; - - *widget = setup_ui (ui); - return ui; -} - -static void -cleanup (LV2UI_Handle handle) -{ - ACompUI* ui = (ACompUI*)handle; - free (ui); -} - -static void -port_event (LV2UI_Handle handle, - uint32_t port_index, - uint32_t buffer_size, - uint32_t format, - const void* buffer) -{ - ACompUI* ui = (ACompUI*)handle; -} - -/****************************************************************************** - * LV2 setup - */ - -static const void* -extension_data (const char* uri) -{ - return NULL; -} - -static const LV2UI_Descriptor descriptor = { - ACOMP_URI "#ui", - instantiate, - cleanup, - port_event, - extension_data -}; - -LV2_SYMBOL_EXPORT -const LV2UI_Descriptor* -lv2ui_descriptor (uint32_t index) -{ - switch (index) { - case 0: - return &descriptor; - default: - return NULL; - } -} diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript index fdb929ed9e..f0ebb1d33d 100644 --- a/libs/plugins/a-comp.lv2/wscript +++ b/libs/plugins/a-comp.lv2/wscript @@ -48,16 +48,4 @@ def build(bld): ) obj.env.cshlib_PATTERN = module_pat - # Build plugin GUI - obj = bld(features = 'cxx cxxshlib', - source = 'ui.cc', - name = 'a-comp-ui', - cxxflags = [ '-fPIC' ], - target = '../../LV2/%s/a-comp-ui' % bundle, - install_path = '${LV2DIR}/%s' % bundle, - uselib = 'GTKMM GTK', - use = 'LV2_1_0_0' - ) - obj.env.cxxshlib_PATTERN = module_pat - # vi:set ts=4 sw=4 et: -- cgit v1.2.3