summaryrefslogtreecommitdiff
path: root/lv2
diff options
context:
space:
mode:
Diffstat (limited to 'lv2')
-rw-r--r--lv2/drumgizmo.ttl47
-rw-r--r--lv2/input_lv2.cc2
-rw-r--r--lv2/lv2.cc69
-rw-r--r--lv2/lv2_instance.h2
4 files changed, 74 insertions, 46 deletions
diff --git a/lv2/drumgizmo.ttl b/lv2/drumgizmo.ttl
index 23345f3..6ce3e91 100644
--- a/lv2/drumgizmo.ttl
+++ b/lv2/drumgizmo.ttl
@@ -37,108 +37,119 @@
lv2:optionalFeature <http://lv2plug.in/ns/ext/uri-map> ;
lv2:optionalFeature <http://lv2plug.in/ns/ext/event> ;
lv2:extensionData state:interface ;
-lv2:port [
+ lv2:port [
+ a lv2:InputPort, lv2:ControlPort ;
+ lv2:index 0 ;
+ lv2:symbol "lv2_freewheel" ;
+ lv2:name "Freewheel" ;
+ lv2:default 0.0 ;
+ lv2:minimum 0.0 ;
+ lv2:maximum 1.0 ;
+ lv2:designation <http://lv2plug.in/ns/lv2core#freeWheeling> ;
+ lv2:portProperty lv2:toggled ;
+ lv2:portProperty epp:hasStrictBounds;
+ ] , [
a atom:AtomPort ,
lv2:InputPort;
atom:bufferType atom:Sequence ;
atom:supports <http://lv2plug.in/ns/ext/midi#MidiEvent> ;
- lv2:index 0 ;
+ lv2:index 1 ;
lv2:symbol "control" ;
lv2:name "Control"
] , [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 1 ;
+ lv2:index 2 ;
lv2:symbol "out1" ;
lv2:name "Out1"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 2 ;
+ lv2:index 3 ;
lv2:symbol "out2" ;
lv2:name "Out2"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 3 ;
+ lv2:index 4 ;
lv2:symbol "out3" ;
lv2:name "Out3"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 4 ;
+ lv2:index 5 ;
lv2:symbol "out4" ;
lv2:name "Out4"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 5 ;
+ lv2:index 6 ;
lv2:symbol "out5" ;
lv2:name "Out5"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 6 ;
+ lv2:index 7 ;
lv2:symbol "out6" ;
lv2:name "Out6"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 7 ;
+ lv2:index 8 ;
lv2:symbol "out7" ;
lv2:name "Out7"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 8 ;
+ lv2:index 9 ;
lv2:symbol "out8" ;
lv2:name "Out8"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 9 ;
+ lv2:index 10 ;
lv2:symbol "out9" ;
lv2:name "Out9"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 10 ;
+ lv2:index 11 ;
lv2:symbol "out10" ;
lv2:name "Out10"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 11 ;
+ lv2:index 12 ;
lv2:symbol "out11" ;
lv2:name "Out11"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 12 ;
+ lv2:index 13 ;
lv2:symbol "out12" ;
lv2:name "Out12"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 13 ;
+ lv2:index 14 ;
lv2:symbol "out13" ;
lv2:name "Out13"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 14 ;
+ lv2:index 15 ;
lv2:symbol "out14" ;
lv2:name "Out14"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 15 ;
+ lv2:index 16 ;
lv2:symbol "out15" ;
lv2:name "Out15"
], [
a lv2:AudioPort ,
lv2:OutputPort ;
- lv2:index 16 ;
+ lv2:index 17 ;
lv2:symbol "out16" ;
lv2:name "Out16"
] .
diff --git a/lv2/input_lv2.cc b/lv2/input_lv2.cc
index e70d293..f65cf83 100644
--- a/lv2/input_lv2.cc
+++ b/lv2/input_lv2.cc
@@ -86,7 +86,7 @@ event_t *InputLV2::run(size_t pos, size_t len, size_t *nevents)
if ((data[0] & 0xF0) == 0x80) { // note off
int key = data[1];
-
+ (void)key;
DEBUG(lv2input, "Event (off) key:%d\n", key);
}
diff --git a/lv2/lv2.cc b/lv2/lv2.cc
index d87665d..9722fad 100644
--- a/lv2/lv2.cc
+++ b/lv2/lv2.cc
@@ -35,6 +35,12 @@
#include <hugin.hpp>
+enum {
+ FREE_WHEEL_PORT = 0,
+ MIDI_PORT,
+ AUDIO_PORT_BASE
+};
+
#define DRUMGIZMO_URI "http://drumgizmo.org/lv2"
#define NS_DG DRUMGIZMO_URI "/atom#"
@@ -47,12 +53,11 @@ static DrumGizmo *dg_get_pci(LV2_Handle instance)
return dglv2->dg;
}
-LV2_State_Status
-dg_save(LV2_Handle instance,
- LV2_State_Store_Function store,
- LV2_State_Handle handle,
- uint32_t flags,
- const LV2_Feature *const * features)
+LV2_State_Status dg_save(LV2_Handle instance,
+ LV2_State_Store_Function store,
+ LV2_State_Handle handle,
+ uint32_t flags,
+ const LV2_Feature *const * features)
{
DGLV2 *dglv2 = (DGLV2 *)instance;
@@ -77,12 +82,11 @@ dg_save(LV2_Handle instance,
return LV2_STATE_SUCCESS;
}
-LV2_State_Status
-dg_restore(LV2_Handle instance,
- LV2_State_Retrieve_Function retrieve,
- LV2_State_Handle handle,
- uint32_t flags,
- const LV2_Feature *const * features)
+LV2_State_Status dg_restore(LV2_Handle instance,
+ LV2_State_Retrieve_Function retrieve,
+ LV2_State_Handle handle,
+ uint32_t flags,
+ const LV2_Feature *const * features)
{
DGLV2 *dglv2 = (DGLV2 *)instance;
@@ -127,6 +131,9 @@ LV2_Handle instantiate(const struct _LV2_Descriptor *descriptor,
{
DGLV2 *dglv2 = new DGLV2;
+ dglv2->free_wheel_port = NULL; // Not assigned
+ dglv2->pos = 0; // Start from the beginning
+
dglv2->map = NULL;
for (int i = 0 ; features[i] ; i++) {
if (!strcmp(features[i]->URI, LV2_URID_URI "#map")) {
@@ -148,19 +155,22 @@ LV2_Handle instantiate(const struct _LV2_Descriptor *descriptor,
return (LV2_Handle)dglv2;
}
-void connect_port(LV2_Handle instance,
- uint32_t port,
- void *data_location)
+void connect_port(LV2_Handle instance, uint32_t port, void *data_location)
{
DGLV2 *dglv2 = (DGLV2 *)instance;
- if(port == 0) {// MIDI in
+ if(port == FREE_WHEEL_PORT) {
+ dglv2->free_wheel_port = (float*)data_location;
+ }
+
+ if(port == MIDI_PORT) { // MIDI in
dglv2->in->eventPort = (LV2_Atom_Sequence*)data_location;
- } else {// Audio Port
- if(port - 1 < NUM_OUTPUTS) {
- dglv2->out->outputPorts[port - 1].samples = (sample_t*)data_location;
- dglv2->out->outputPorts[port - 1].size = 0;
- }
+ }
+
+ if(port >= AUDIO_PORT_BASE) { // Audio Port
+ uint32_t audio_port = port - AUDIO_PORT_BASE;
+ dglv2->out->outputPorts[audio_port].samples = (sample_t*)data_location;
+ dglv2->out->outputPorts[audio_port].size = 0;
}
}
@@ -171,20 +181,25 @@ void activate(LV2_Handle instance)
(void)dglv2;
}
-void run(LV2_Handle instance,
- uint32_t sample_count)
+void run(LV2_Handle instance, uint32_t sample_count)
{
- static size_t pos = 0;
DGLV2 *dglv2 = (DGLV2 *)instance;
- dglv2->dg->run(pos, dglv2->buffer, sample_count);
+ if(dglv2->free_wheel_port) {
+ dglv2->dg->setFreeWheel(*dglv2->free_wheel_port);
+ }
+
+ if(dglv2->buffer_size != sample_count) {
+ dglv2->buffer_size = sample_count;
+ dglv2->dg->setFrameSize(sample_count);
+ }
+ dglv2->dg->run(dglv2->pos, dglv2->buffer, sample_count);
- pos += sample_count;
+ dglv2->pos += sample_count;
}
void deactivate(LV2_Handle instance)
{
- // We don't really need to do anything here.
DGLV2 *dglv2 = (DGLV2 *)instance;
dglv2->dg->stop();
}
diff --git a/lv2/lv2_instance.h b/lv2/lv2_instance.h
index e050e22..0ce98bb 100644
--- a/lv2/lv2_instance.h
+++ b/lv2/lv2_instance.h
@@ -43,6 +43,8 @@ typedef struct {
sample_t *buffer;
size_t buffer_size;
LV2_URID_Map* map;
+ float* free_wheel_port;
+ size_t pos;
} DGLV2;
#endif/*__DRUMGIZMO_LV2_INSTANCE_H__*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 11:04:08 +0000