From 8fee183109728ec2fad88d332940b93a1d882c20 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 22 May 2012 20:50:17 +0000 Subject: Add mising units: prefixes. Make some ports CVPort. git-svn-id: http://svn.drobilla.net/lad/trunk/plugins/blip.lv2@4436 a436a847-0d15-0410-975c-d299462d15a1 --- blip.lv2/adsr.ttl | 2 +- blip.lv2/adsr_gt.ttl | 4 ++-- blip.lv2/amp.ttl | 1 + blip.lv2/dahdsr.ttl | 4 ++-- blip.lv2/fmod.ttl | 1 + blip.lv2/product.ttl | 12 ++++++------ blip.lv2/random.ttl | 1 + blip.lv2/tracker.ttl | 2 +- src/product.c | 12 ++++++------ 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/blip.lv2/adsr.ttl b/blip.lv2/adsr.ttl index ec93b9f..49fcd05 100644 --- a/blip.lv2/adsr.ttl +++ b/blip.lv2/adsr.ttl @@ -18,7 +18,7 @@ blip:adsr lv2:index 0 ; lv2:name "Driving Signal" ; lv2:symbol "port0" ; - a lv2:AudioPort , + a lv2:CVPort , lv2:InputPort , lv2:Port ] , [ diff --git a/blip.lv2/adsr_gt.ttl b/blip.lv2/adsr_gt.ttl index b4522e4..8cf025c 100644 --- a/blip.lv2/adsr_gt.ttl +++ b/blip.lv2/adsr_gt.ttl @@ -18,14 +18,14 @@ blip:adsr_gt lv2:index 0 ; lv2:name "Gate" ; lv2:symbol "port0" ; - a lv2:AudioPort , + a lv2:CVPort , lv2:InputPort , lv2:Port ] , [ lv2:index 1 ; lv2:name "Trigger" ; lv2:symbol "port1" ; - a lv2:AudioPort , + a lv2:CVPort , lv2:InputPort , lv2:Port ] , [ diff --git a/blip.lv2/amp.ttl b/blip.lv2/amp.ttl index 84c2b5f..7355a16 100644 --- a/blip.lv2/amp.ttl +++ b/blip.lv2/amp.ttl @@ -7,6 +7,7 @@ @prefix owl: . @prefix rdf: . @prefix rdfs: . +@prefix units: . @prefix xsd: . blip:amp diff --git a/blip.lv2/dahdsr.ttl b/blip.lv2/dahdsr.ttl index 2060655..0f05cfb 100644 --- a/blip.lv2/dahdsr.ttl +++ b/blip.lv2/dahdsr.ttl @@ -18,14 +18,14 @@ blip:dahdsr lv2:index 0 ; lv2:name "Gate" ; lv2:symbol "port0" ; - a lv2:AudioPort , + a lv2:CVPort , lv2:InputPort , lv2:Port ] , [ lv2:index 1 ; lv2:name "Trigger" ; lv2:symbol "port1" ; - a lv2:AudioPort , + a lv2:CVPort , lv2:InputPort , lv2:Port ] , [ diff --git a/blip.lv2/fmod.ttl b/blip.lv2/fmod.ttl index 749978b..3d59713 100644 --- a/blip.lv2/fmod.ttl +++ b/blip.lv2/fmod.ttl @@ -7,6 +7,7 @@ @prefix owl: . @prefix rdf: . @prefix rdfs: . +@prefix units: . @prefix xsd: . blip:fmod diff --git a/blip.lv2/product.ttl b/blip.lv2/product.ttl index af6fc4a..a533dad 100644 --- a/blip.lv2/product.ttl +++ b/blip.lv2/product.ttl @@ -15,22 +15,22 @@ blip:product lv2:optionalFeature lv2:hardRTCapable ; lv2:port [ lv2:index 0 ; - lv2:name "First Input" ; - lv2:symbol "port0" ; + lv2:name "Multiplicand" ; + lv2:symbol "multiplicand" ; a lv2:ControlPort , lv2:InputPort , lv2:Port ] , [ lv2:index 1 ; - lv2:name "Second Input" ; - lv2:symbol "port1" ; + lv2:name "Multiplier" ; + lv2:symbol "multiplier" ; a lv2:ControlPort , lv2:InputPort , lv2:Port ] , [ lv2:index 2 ; - lv2:name "Product Output" ; - lv2:symbol "port2" ; + lv2:name "Product" ; + lv2:symbol "product" ; a lv2:ControlPort , lv2:OutputPort , lv2:Port diff --git a/blip.lv2/random.ttl b/blip.lv2/random.ttl index 634e569..abdc38e 100644 --- a/blip.lv2/random.ttl +++ b/blip.lv2/random.ttl @@ -7,6 +7,7 @@ @prefix owl: . @prefix rdf: . @prefix rdfs: . +@prefix units: . @prefix xsd: . blip:random diff --git a/blip.lv2/tracker.ttl b/blip.lv2/tracker.ttl index 60c8155..2894986 100644 --- a/blip.lv2/tracker.ttl +++ b/blip.lv2/tracker.ttl @@ -17,7 +17,7 @@ blip:tracker lv2:index 0 ; lv2:name "Gate" ; lv2:symbol "port0" ; - a lv2:AudioPort , + a lv2:CVPort , lv2:InputPort , lv2:Port ] , [ diff --git a/src/product.c b/src/product.c index 5c0b488..cfcc62e 100644 --- a/src/product.c +++ b/src/product.c @@ -20,9 +20,9 @@ #include #include "lv2/lv2plug.in/ns/lv2core/lv2.h" -#define PRODUCT_INPUT1 0 -#define PRODUCT_INPUT2 1 -#define PRODUCT_OUTPUT 2 +#define PRODUCT_MULTIPLICAND 0 +#define PRODUCT_MULTIPLIER 1 +#define PRODUCT_PRODUCT 2 typedef struct { float* input1; @@ -44,13 +44,13 @@ connect_port(LV2_Handle instance, Product* plugin = (Product*)instance; switch (port) { - case PRODUCT_INPUT1: + case PRODUCT_MULTIPLICAND: plugin->input1 = data; break; - case PRODUCT_INPUT2: + case PRODUCT_MULTIPLIER: plugin->input2 = data; break; - case PRODUCT_OUTPUT: + case PRODUCT_PRODUCT: plugin->output = data; break; } -- cgit v1.2.1