MAJOR rewrite of the internals. New input/output 'plugin' system. Still a lot missing.

1 files changed, 41 insertions, 6 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ec0802..df904db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,35 +1,70 @@
 bin_PROGRAMS = drumgizmo
 
-drumgizmo_LDADD = $(JACK_LIBS) $(SNDFILE_LIBS) $(SMF_LIBS)
+drumgizmo_LDADD = $(ALSA_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) $(SMF_LIBS) \
+	$(PTHREAD_CFLAGS)
 
-drumgizmo_CXXFLAGS = $(JACK_CXXFLAGS) $(SNDFILE_CXXFLAGS) $(SMF_CFLAGS)
+drumgizmo_CXXFLAGS = $(ALSA_CFLAGS) $(JACK_CXXFLAGS) $(SNDFILE_CXXFLAGS) \
+	 $(SMF_CFLAGS) $(PTHREAD_LIBS)
 
 drumgizmo_SOURCES = \
+	audioinputengine.cc \
+	audioinputenginejackmidi.cc \
+	audiooutputengine.cc \
+	audiooutputenginealsa.cc \
+	audiooutputenginejack.cc \
+	audiooutputenginesndfile.cc \
 	audiofile.cc \
-	beatmapper.cc \
+	cli.cc \
 	channel.cc \
+	channelmixer.cc \
 	drumgizmo.cc \
 	drumkitparser.cc \
 	event.cc \
 	instrument.cc \
-	jackclient.cc \
 	midimapper.cc \
 	midiplayer.cc \
+	mutex.cc \
 	sample.cc \
 	saxparser.cc \
+	thread.cc \
 	velocity.cc
 
+#	beatmapper.cc
+
 EXTRA_DIST = \
+	audio.h \
+	audioinputengine.h \
+	audioinputenginejackmidi.h \
+	audiooutputengine.h \
+	audiooutputenginealsa.h \
+	audiooutputenginejack.h \
+	audiooutputenginesndfile.h \
 	audiofile.h \
-	beatmapper.h \
 	channel.h \
+	channelmixer.h \
+	drumgizmo.h \
 	drumkit.h \
 	drumkitparser.h \
 	event.h \
 	instrument.h \
-	jackclient.h \
 	midimapper.h \
 	midiplayer.h \
+	mutex.h \
+	rangemap.h \
 	sample.h \
 	saxparser.h \
+	thread.h \
 	velocity.h
+
+#	beatmapper.h
+
+################
+# Test Section #
+################
+
+TEST_SOURCE_DEPS = ${drumgizmo_SOURCES} ${EXTRA_DIST}
+TEST_SCRIPT_DIR = $(top_srcdir)/tools
+
+include ${TEST_SCRIPT_DIR}/Makefile.am.test
+
+include Makefile.am.test
\ No newline at end of file