From 4fb69a0c62540c8a9f2613e55731e30dc05d619f Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 25 Jul 2013 16:08:58 +0200 Subject: Patch from Yiannis Liverezas. Fix mulitple variables with the same name in jackmidi.cc and add missing file to plugingui/Makefile.am. --- drumgizmo/input/jackmidi/jackmidi.cc | 6 +++--- plugingui/Makefile.am | 3 ++- 2 files changed, 5 insertions(+), 4 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++; diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index fed12fc..95838c3 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -17,7 +17,8 @@ plugingui_SOURCES = \ $(top_srcdir)/src/thread.cc \ $(top_srcdir)/src/semaphore.cc \ $(top_srcdir)/src/mutex.cc \ - $(top_srcdir)/src/messagehandler.cc + $(top_srcdir)/src/messagehandler.cc \ + $(top_srcdir)/src/messagereceiver.cc rcgen_SOURCES = rcgen.cc -- cgit v1.2.3