diff options
| author | David Robillard <d@drobilla.net> | 2008-05-23 05:16:33 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-05-23 05:16:33 +0000 |
| commit | 2c46e6a464d2ac5be8e16a62fba6f00924090ea8 (patch) | |
| tree | dd5471166f91ad922e7b8f987a648558a88c45fc /src/libs/engine/MidiControlNode.cpp | |
| parent | 0dbcca14bcbcb3aa7e7c0ae24934463a5973a651 (diff) | |
| download | ingen-2c46e6a464d2ac5be8e16a62fba6f00924090ea8.tar.gz ingen-2c46e6a464d2ac5be8e16a62fba6f00924090ea8.tar.bz2 ingen-2c46e6a464d2ac5be8e16a62fba6f00924090ea8.zip | |
Fix infinite loops (and jack death) on internal MIDI nodes (note, trigger, control).
git-svn-id: http://svn.drobilla.net/lad/ingen@1231 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/MidiControlNode.cpp')
| -rw-r--r-- | src/libs/engine/MidiControlNode.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libs/engine/MidiControlNode.cpp b/src/libs/engine/MidiControlNode.cpp index 263180f7..45f5f034 100644 --- a/src/libs/engine/MidiControlNode.cpp +++ b/src/libs/engine/MidiControlNode.cpp @@ -75,16 +75,15 @@ MidiControlNode::process(ProcessContext& context) uint32_t subframes = 0; uint16_t type = 0; uint16_t size = 0; - uint8_t* data = NULL; + uint8_t* buf = NULL; EventBuffer* const midi_in = (EventBuffer*)_midi_in_port->buffer(0); assert(midi_in->this_nframes() == context.nframes()); - while (midi_in->get_event(&frames, &subframes, &type, &size, &data) < context.nframes()) { - + while (midi_in->get_event(&frames, &subframes, &type, &size, &buf)) { // FIXME: type - if (size >= 3 && (data[0] & 0xF0) == MIDI_CMD_CONTROL) - control(data[1], data[2], (SampleCount)frames); + if (size >= 3 && (buf[0] & 0xF0) == MIDI_CMD_CONTROL) + control(buf[1], buf[2], (SampleCount)frames); midi_in->increment(); } |