summaryrefslogtreecommitdiff
path: root/drumgizmo/input/jackmidi/jackmidi.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2013-07-25 16:08:58 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2013-07-25 16:08:58 +0200
commit4fb69a0c62540c8a9f2613e55731e30dc05d619f (patch)
treebb24a0b92969aaadd0d48daad4433e4f9d648b81 /drumgizmo/input/jackmidi/jackmidi.cc
parent77cd7380d951b136c7c505ef9ca580643fcfc9e1 (diff)
Patch from Yiannis Liverezas. Fix mulitple variables with the same name in jackmidi.cc and add missing file to plugingui/Makefile.am.
Diffstat (limited to 'drumgizmo/input/jackmidi/jackmidi.cc')
-rw-r--r--drumgizmo/input/jackmidi/jackmidi.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/drumgizmo/input/jackmidi/jackmidi.cc b/drumgizmo/input/jackmidi/jackmidi.cc
index e3f2164..89db418 100644
--- a/drumgizmo/input/jackmidi/jackmidi.cc
+++ b/drumgizmo/input/jackmidi/jackmidi.cc
@@ -155,12 +155,12 @@ void JackMidi::jack_process(jack_nframes_t nframes)
printf("Event key:%d vel:%d\n", key, velocity);
- int i = mmap.lookup(key);
- if(i != -1) {
+ int k = mmap.lookup(key);
+ if(k != -1) {
if(velocity) {
list[listsize].type = TYPE_ONSET;
- list[listsize].instrument = i;
+ list[listsize].instrument = k;
list[listsize].velocity = velocity / 127.0;
list[listsize].offset = event.time;
listsize++;