From 7924b3c3b64950758fbba5b0a68e9b3432b7a892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Thu, 12 May 2016 10:01:25 +0200 Subject: Reduced some code redundancy --- drumgizmo/input/jackmidi.cc | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'drumgizmo/input/jackmidi.cc') diff --git a/drumgizmo/input/jackmidi.cc b/drumgizmo/input/jackmidi.cc index 7c5cf1c..0839ae3 100644 --- a/drumgizmo/input/jackmidi.cc +++ b/drumgizmo/input/jackmidi.cc @@ -118,22 +118,14 @@ void JackMidiInputEngine::process(jack_nframes_t num_frames) { jack_midi_event_t event; jack_midi_event_get(&event, buffer, i); - if(event.size != 3) - { + + event_t out; + if (!midi_processor(event.size, event.buffer, out)) { + // unsupported event continue; } - if((event.buffer[0] & NOTE_ON) != NOTE_ON) - { - continue; - } - int key = event.buffer[1]; - int velocity = event.buffer[2]; - printf("Event key:%d vel:%d\n", key, velocity); - int k = mmap.lookup(key); - if(k != -1 && velocity) - { - events.push_back({TYPE_ONSET, (size_t)k, event.time, velocity / 127.f}); - } + out.offset = event.time; + events.push_back(out); } jack_midi_clear_buffer(buffer); pos += num_frames; -- cgit v1.2.3