diff options
| author | David Robillard <d@drobilla.net> | 2011-02-12 05:34:01 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-02-12 05:34:01 +0000 |
| commit | ffc0c362494f8a37a42713f387301e2f4744c4ac (patch) | |
| tree | 725ec4c07e352929339a96973b12f4afca9fa746 | |
| parent | 4df82a7a22f53bd36533d452dd68e05e3a81d507 (diff) | |
| download | lilv-ffc0c362494f8a37a42713f387301e2f4744c4ac.tar.gz lilv-ffc0c362494f8a37a42713f387301e2f4744c4ac.tar.bz2 lilv-ffc0c362494f8a37a42713f387301e2f4744c4ac.zip | |
Fix MIDI output delivery.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2935 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | hosts/lv2_jack_host.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c index f3d4267..d4d2783 100644 --- a/hosts/lv2_jack_host.c +++ b/hosts/lv2_jack_host.c @@ -178,7 +178,7 @@ jack_process_cb(jack_nframes_t nframes, void* data) { struct JackHost* const host = (struct JackHost*)data; - /* Connect inputs */ + /* Prepare port buffers */ for (uint32_t p = 0; p < host->num_ports; ++p) { if (!host->ports[p].jack_port) continue; @@ -196,16 +196,15 @@ jack_process_cb(jack_nframes_t nframes, void* data) (uint8_t*)(host->ports[p].ev_buffer + 1)); if (host->ports[p].direction == INPUT) { - void* buffer = jack_port_get_buffer(host->ports[p].jack_port, - nframes); + void* buf = jack_port_get_buffer(host->ports[p].jack_port, + nframes); LV2_Event_Iterator iter; lv2_event_begin(&iter, host->ports[p].ev_buffer); - const jack_nframes_t n = jack_midi_get_event_count(buffer); - for (jack_nframes_t e = 0; e < n; ++e) { + for (uint32_t i = 0; i < jack_midi_get_event_count(buf); ++i) { jack_midi_event_t ev; - jack_midi_event_get(&ev, buffer, e); + jack_midi_event_get(&ev, buf, i); lv2_event_write(&iter, ev.time, 0, MIDI_EVENT_ID, ev.size, ev.buffer); @@ -220,22 +219,21 @@ jack_process_cb(jack_nframes_t nframes, void* data) /* Deliver MIDI output */ for (uint32_t p = 0; p < host->num_ports; ++p) { if (host->ports[p].jack_port - && host->ports[p].direction == INPUT + && host->ports[p].direction == OUTPUT && host->ports[p].type == EVENT) { - void* buffer = jack_port_get_buffer(host->ports[p].jack_port, - nframes); + void* buf = jack_port_get_buffer(host->ports[p].jack_port, + nframes); - jack_midi_clear_buffer(buffer); + jack_midi_clear_buffer(buf); LV2_Event_Iterator iter; lv2_event_begin(&iter, host->ports[p].ev_buffer); - const uint32_t n = iter.buf->event_count; - for (uint32_t i = 0; i < n; ++i) { + for (uint32_t i = 0; i < iter.buf->event_count; ++i) { uint8_t* data; LV2_Event* ev = lv2_event_get(&iter, &data); - jack_midi_event_write(buffer, ev->frames, data, ev->size); + jack_midi_event_write(buf, ev->frames, data, ev->size); lv2_event_increment(&iter); } } |