summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kits/test/midimap.xml10
-rw-r--r--plugingui/Makefile.am2
-rw-r--r--plugingui/Makefile.am.plugingui3
3 files changed, 8 insertions, 7 deletions
diff --git a/kits/test/midimap.xml b/kits/test/midimap.xml
index 908996a..031351c 100644
--- a/kits/test/midimap.xml
+++ b/kits/test/midimap.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<midimap>
- <map note="35" instr="kick"/>
- <map note="36" instr="kick"/>
+ <map note="35" instr="kick-r"/>
+ <map note="36" instr="kick-l"/>
<map note="38" instr="snare"/>
@@ -15,11 +15,11 @@
<map note="51" instr="ride"/>
<map note="53" instr="ride-bell"/>
- <map note="49" instr="crash-1"/>
- <map note="57" instr="crash-2"/>
+ <map note="49" instr="crash1"/>
+ <map note="57" instr="crash2"/>
<map note="52" instr="china"/>
<map note="55" instr="splash"/>
-</midimap> \ No newline at end of file
+</midimap>
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am
index 20150c5..957ca76 100644
--- a/plugingui/Makefile.am
+++ b/plugingui/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = plugingui
plugingui_LDADD = $(SNDFILE_LIBS) $(PTHREAD_LIBS) $(EXPAT_LIBS) -ldl -lX11
-plugingui_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/src -DSTANDALONE -DX11
+plugingui_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/src -DSTANDALONE -DX11 -DUSE_THREAD
include Makefile.am.plugingui
include $(top_srcdir)/src/Makefile.am.drumgizmo
diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui
index fd0e7cb..634c641 100644
--- a/plugingui/Makefile.am.plugingui
+++ b/plugingui/Makefile.am.plugingui
@@ -14,7 +14,8 @@ PLUGIN_GUI_SOURCES = \
$(top_srcdir)/plugingui/lineedit.cc \
$(top_srcdir)/plugingui/led.cc \
$(top_srcdir)/plugingui/checkbox.cc \
- $(top_srcdir)/plugingui/slider.cc
+ $(top_srcdir)/plugingui/slider.cc \
+ $(top_srcdir)/plugingui/thread.cc
PLUGIN_GUI_LIBS = -lX11