moved around and renamed stuff

33 files changed, 289 insertions, 70 deletions

diff --git a/src/.deps/DSSI-render.Po b/src/.deps/DSSI-render.Po
new file mode 100644
index 0000000..a67c974
--- /dev/null
+++ b/src/.deps/DSSI-render.Po
@@ -0,0 +1,218 @@
+DSSI-render.o: DSSI-render.c /usr/include/stdc-predef.h DSSI-render.h \
+ /usr/include/sndfile.h /usr/include/stdio.h /usr/include/features.h \
+ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/include/sys/types.h /usr/include/time.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/bits/time.h \
+ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+ /usr/include/ladspa.h /usr/include/dssi.h /usr/include/alsa/seq_event.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \
+ /usr/include/bits/string2.h /usr/include/assert.h /usr/include/dlfcn.h \
+ /usr/include/bits/dlfcn.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
+ /usr/include/bits/confname.h /usr/include/getopt.h /usr/include/math.h \
+ /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \
+ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
+ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
+ /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \
+ /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/sys/time.h \
+ /usr/include/sys/wait.h /usr/include/signal.h /usr/include/bits/signum.h \
+ /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/bits/sigstack.h \
+ /usr/include/sys/ucontext.h /usr/include/bits/sigthread.h \
+ /usr/include/dirent.h /usr/include/bits/dirent.h \
+ /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h \
+ /usr/include/linux/limits.h /usr/include/libgen.h ladspa_run_synth.h \
+ midi/midi_loader.h midi/fluid_list.h midi/fluidsynth_priv.h \
+ midi/fluid_midi_custom.h midi/midi_loader.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h \
+ /usr/include/stdint.h /usr/include/bits/wchar.h midi/fluid_midi.h
+
+/usr/include/stdc-predef.h:
+
+DSSI-render.h:
+
+/usr/include/sndfile.h:
+
+/usr/include/stdio.h:
+
+/usr/include/features.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/bits/wordsize.h:
+
+/usr/include/gnu/stubs.h:
+
+/usr/include/gnu/stubs-64.h:
+
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h:
+
+/usr/include/bits/types.h:
+
+/usr/include/bits/typesizes.h:
+
+/usr/include/libio.h:
+
+/usr/include/_G_config.h:
+
+/usr/include/wchar.h:
+
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h:
+
+/usr/include/bits/stdio_lim.h:
+
+/usr/include/bits/sys_errlist.h:
+
+/usr/include/bits/stdio.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/time.h:
+
+/usr/include/endian.h:
+
+/usr/include/bits/endian.h:
+
+/usr/include/bits/byteswap.h:
+
+/usr/include/bits/byteswap-16.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/bits/select.h:
+
+/usr/include/bits/sigset.h:
+
+/usr/include/bits/time.h:
+
+/usr/include/sys/sysmacros.h:
+
+/usr/include/bits/pthreadtypes.h:
+
+/usr/include/ladspa.h:
+
+/usr/include/dssi.h:
+
+/usr/include/alsa/seq_event.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/bits/waitflags.h:
+
+/usr/include/bits/waitstatus.h:
+
+/usr/include/alloca.h:
+
+/usr/include/bits/stdlib-bsearch.h:
+
+/usr/include/bits/stdlib-float.h:
+
+/usr/include/string.h:
+
+/usr/include/xlocale.h:
+
+/usr/include/bits/string.h:
+
+/usr/include/bits/string2.h:
+
+/usr/include/assert.h:
+
+/usr/include/dlfcn.h:
+
+/usr/include/bits/dlfcn.h:
+
+/usr/include/unistd.h:
+
+/usr/include/bits/posix_opt.h:
+
+/usr/include/bits/environments.h:
+
+/usr/include/bits/confname.h:
+
+/usr/include/getopt.h:
+
+/usr/include/math.h:
+
+/usr/include/bits/huge_val.h:
+
+/usr/include/bits/huge_valf.h:
+
+/usr/include/bits/huge_vall.h:
+
+/usr/include/bits/inf.h:
+
+/usr/include/bits/nan.h:
+
+/usr/include/bits/mathdef.h:
+
+/usr/include/bits/mathcalls.h:
+
+/usr/include/bits/mathinline.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/bits/stat.h:
+
+/usr/include/sys/time.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/signal.h:
+
+/usr/include/bits/signum.h:
+
+/usr/include/bits/siginfo.h:
+
+/usr/include/bits/sigaction.h:
+
+/usr/include/bits/sigcontext.h:
+
+/usr/include/bits/sigstack.h:
+
+/usr/include/sys/ucontext.h:
+
+/usr/include/bits/sigthread.h:
+
+/usr/include/dirent.h:
+
+/usr/include/bits/dirent.h:
+
+/usr/include/bits/posix1_lim.h:
+
+/usr/include/bits/local_lim.h:
+
+/usr/include/linux/limits.h:
+
+/usr/include/libgen.h:
+
+ladspa_run_synth.h:
+
+midi/midi_loader.h:
+
+midi/fluid_list.h:
+
+midi/fluidsynth_priv.h:
+
+midi/fluid_midi_custom.h:
+
+midi/midi_loader.h:
+
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h:
+
+/usr/include/stdint.h:
+
+/usr/include/bits/wchar.h:
+
+midi/fluid_midi.h:
diff --git a/src/.deps/ladspa_run_synth.Po b/src/.deps/ladspa_run_synth.Po
index 6806114..f9f3989 100644
--- a/src/.deps/ladspa_run_synth.Po
+++ b/src/.deps/ladspa_run_synth.Po
@@ -1,12 +1,12 @@
 ladspa_run_synth.o: ladspa_run_synth.c /usr/include/stdc-predef.h \
- cli-dssi-host.h /usr/include/sndfile.h /usr/include/stdio.h \
+ DSSI-render.h /usr/include/sndfile.h /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
  /usr/include/bits/stdio.h /usr/include/sys/types.h /usr/include/time.h \
  /usr/include/endian.h /usr/include/bits/endian.h \
@@ -37,12 +37,12 @@ ladspa_run_synth.o: ladspa_run_synth.c /usr/include/stdc-predef.h \
  /usr/include/linux/limits.h /usr/include/libgen.h midi/midi_loader.h \
  midi/fluid_list.h midi/fluidsynth_priv.h midi/fluid_midi_custom.h \
  midi/midi_loader.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h \
  /usr/include/stdint.h /usr/include/bits/wchar.h midi/fluid_midi.h
 
 /usr/include/stdc-predef.h:
 
-cli-dssi-host.h:
+DSSI-render.h:
 
 /usr/include/sndfile.h:
 
@@ -58,7 +58,7 @@ cli-dssi-host.h:
 
 /usr/include/gnu/stubs-64.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h:
 
 /usr/include/bits/types.h:
 
@@ -70,7 +70,7 @@ cli-dssi-host.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
@@ -208,7 +208,7 @@ midi/fluid_midi_custom.h:
 
 midi/midi_loader.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h:
 
 /usr/include/stdint.h:
 
diff --git a/src/DSSI-render b/src/DSSI-render
new file mode 100755
index 0000000..344edec
--- /dev/null
+++ b/src/DSSI-render
diff --git a/src/cli-dssi-host.c b/src/DSSI-render.c
index 5650cd8..f9e3fad 100644
--- a/src/cli-dssi-host.c
+++ b/src/DSSI-render.c
@@ -1,4 +1,4 @@
-/* cli-dssi-host.c
+/*
  * Copyright (C) 2005 James McDermott
  * jamesmichaelmcdermott@gmail.com
  *
@@ -22,7 +22,7 @@
  */
 #define CLI_FUNCS
 
-#include "cli-dssi-host.h"
+#include "DSSI-render.h"
 #include "ladspa_run_synth.h"
 #include "midi/midi_loader.h" 
 
diff --git a/src/cli-dssi-host.h b/src/DSSI-render.h
index 3f6d0cc..3f6d0cc 100644
--- a/src/cli-dssi-host.h
+++ b/src/DSSI-render.h
diff --git a/src/DSSI-render.o b/src/DSSI-render.o
new file mode 100644
index 0000000..ba90714
--- /dev/null
+++ b/src/DSSI-render.o
diff --git a/src/Makefile b/src/Makefile
index cceb3ff..5237a3b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = x86_64-unknown-linux-gnu
 host_triplet = x86_64-unknown-linux-gnu
-bin_PROGRAMS = cli-dssi-host$(EXEEXT)
+bin_PROGRAMS = DSSI-render$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
@@ -91,14 +91,13 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_cli_dssi_host_OBJECTS = cli-dssi-host.$(OBJEXT) \
+am_DSSI_render_OBJECTS = DSSI-render.$(OBJEXT) \
 	ladspa_run_synth.$(OBJEXT)
-cli_dssi_host_OBJECTS = $(am_cli_dssi_host_OBJECTS)
+DSSI_render_OBJECTS = $(am_DSSI_render_OBJECTS)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-cli_dssi_host_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	midi/libfluidmidi.la
+DSSI_render_DEPENDENCIES = $(am__DEPENDENCIES_2) midi/libfluidmidi.la
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
@@ -137,8 +136,8 @@ AM_V_CCLD = $(am__v_CCLD_$(V))
 am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(cli_dssi_host_SOURCES)
-DIST_SOURCES = $(cli_dssi_host_SOURCES)
+SOURCES = $(DSSI_render_SOURCES)
+DIST_SOURCES = $(DSSI_render_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -249,6 +248,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
+LT_SYS_LIBRARY_PATH = 
 MAKEINFO = ${SHELL} /home/pepper/DSSI/dssi-render/missing makeinfo
 MANIFEST_TOOL = :
 MKDIR_P = /usr/bin/mkdir -p
@@ -332,8 +332,8 @@ top_srcdir = ..
 SUBDIRS = midi
 AM_CFLAGS = -Wall -std=c99 $(DSSI_CFLAGS) $(SNDFILE_CFLAGS) $(ALSA_CFLAGS)
 AM_LIBS = $(DSSI_LIBS) $(SNDFILE_LIBS) $(ALSA_LIBS)
-cli_dssi_host_SOURCES = cli-dssi-host.c cli-dssi-host.h ladspa_run_synth.c
-cli_dssi_host_LDADD = $(AM_LIBS) -lm -ldl midi/libfluidmidi.la
+DSSI_render_SOURCES = DSSI-render.c DSSI-render.h ladspa_run_synth.c
+DSSI_render_LDADD = $(AM_LIBS) -lm -ldl midi/libfluidmidi.la
 EXTRA_DIST = lts.prs
 all: all-recursive
 
@@ -419,9 +419,9 @@ clean-binPROGRAMS:
 	echo " rm -f" $$list; \
 	rm -f $$list
 
-cli-dssi-host$(EXEEXT): $(cli_dssi_host_OBJECTS) $(cli_dssi_host_DEPENDENCIES) $(EXTRA_cli_dssi_host_DEPENDENCIES) 
-	@rm -f cli-dssi-host$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(cli_dssi_host_OBJECTS) $(cli_dssi_host_LDADD) $(LIBS)
+DSSI-render$(EXEEXT): $(DSSI_render_OBJECTS) $(DSSI_render_DEPENDENCIES) $(EXTRA_DSSI_render_DEPENDENCIES) 
+	@rm -f DSSI-render$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(DSSI_render_OBJECTS) $(DSSI_render_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -429,7 +429,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-include ./$(DEPDIR)/cli-dssi-host.Po
+include ./$(DEPDIR)/DSSI-render.Po
 include ./$(DEPDIR)/ladspa_run_synth.Po
 
 .c.o:
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d11bbf..6d909a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
 SUBDIRS = midi
 
-bin_PROGRAMS = cli-dssi-host
+bin_PROGRAMS = DSSI-render
 
 AM_CFLAGS = -Wall -std=c99 $(DSSI_CFLAGS) $(SNDFILE_CFLAGS) $(ALSA_CFLAGS)
 AM_LIBS = $(DSSI_LIBS) $(SNDFILE_LIBS) $(ALSA_LIBS)
 
-cli_dssi_host_SOURCES = cli-dssi-host.c cli-dssi-host.h ladspa_run_synth.c
-cli_dssi_host_LDADD = $(AM_LIBS) -lm -ldl midi/libfluidmidi.la
+DSSI_render_SOURCES = DSSI-render.c DSSI-render.h ladspa_run_synth.c
+DSSI_render_LDADD = $(AM_LIBS) -lm -ldl midi/libfluidmidi.la
 
 EXTRA_DIST = lts.prs
diff --git a/src/Makefile.in b/src/Makefile.in
index 73f2da6..319f305 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = cli-dssi-host$(EXEEXT)
+bin_PROGRAMS = DSSI-render$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
@@ -91,14 +91,13 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_cli_dssi_host_OBJECTS = cli-dssi-host.$(OBJEXT) \
+am_DSSI_render_OBJECTS = DSSI-render.$(OBJEXT) \
 	ladspa_run_synth.$(OBJEXT)
-cli_dssi_host_OBJECTS = $(am_cli_dssi_host_OBJECTS)
+DSSI_render_OBJECTS = $(am_DSSI_render_OBJECTS)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-cli_dssi_host_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	midi/libfluidmidi.la
+DSSI_render_DEPENDENCIES = $(am__DEPENDENCIES_2) midi/libfluidmidi.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -137,8 +136,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(cli_dssi_host_SOURCES)
-DIST_SOURCES = $(cli_dssi_host_SOURCES)
+SOURCES = $(DSSI_render_SOURCES)
+DIST_SOURCES = $(DSSI_render_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -249,6 +248,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -332,8 +332,8 @@ top_srcdir = @top_srcdir@
 SUBDIRS = midi
 AM_CFLAGS = -Wall -std=c99 $(DSSI_CFLAGS) $(SNDFILE_CFLAGS) $(ALSA_CFLAGS)
 AM_LIBS = $(DSSI_LIBS) $(SNDFILE_LIBS) $(ALSA_LIBS)
-cli_dssi_host_SOURCES = cli-dssi-host.c cli-dssi-host.h ladspa_run_synth.c
-cli_dssi_host_LDADD = $(AM_LIBS) -lm -ldl midi/libfluidmidi.la
+DSSI_render_SOURCES = DSSI-render.c DSSI-render.h ladspa_run_synth.c
+DSSI_render_LDADD = $(AM_LIBS) -lm -ldl midi/libfluidmidi.la
 EXTRA_DIST = lts.prs
 all: all-recursive
 
@@ -419,9 +419,9 @@ clean-binPROGRAMS:
 	echo " rm -f" $$list; \
 	rm -f $$list
 
-cli-dssi-host$(EXEEXT): $(cli_dssi_host_OBJECTS) $(cli_dssi_host_DEPENDENCIES) $(EXTRA_cli_dssi_host_DEPENDENCIES) 
-	@rm -f cli-dssi-host$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(cli_dssi_host_OBJECTS) $(cli_dssi_host_LDADD) $(LIBS)
+DSSI-render$(EXEEXT): $(DSSI_render_OBJECTS) $(DSSI_render_DEPENDENCIES) $(EXTRA_DSSI_render_DEPENDENCIES) 
+	@rm -f DSSI-render$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(DSSI_render_OBJECTS) $(DSSI_render_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -429,7 +429,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cli-dssi-host.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DSSI-render.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ladspa_run_synth.Po@am__quote@
 
 .c.o:
diff --git a/src/cli-dssi-host b/src/cli-dssi-host
deleted file mode 100755
index 17cafb4..0000000
--- a/src/cli-dssi-host
+++ /dev/null
diff --git a/src/cli-dssi-host.o b/src/cli-dssi-host.o
deleted file mode 100644
index d6e4f08..0000000
--- a/src/cli-dssi-host.o
+++ /dev/null
diff --git a/src/ladspa_run_synth.c b/src/ladspa_run_synth.c
index 5265e16..929071a 100644
--- a/src/ladspa_run_synth.c
+++ b/src/ladspa_run_synth.c
@@ -1,4 +1,4 @@
-#include "cli-dssi-host.h"
+#include "DSSI-render.h"
 #include "midi/midi_loader.h" 
 
   /* Instead of creating an alsa midi input, we fill in two events
diff --git a/src/ladspa_run_synth.o b/src/ladspa_run_synth.o
index 0ce78af..5b5e4ca 100644
--- a/src/ladspa_run_synth.o
+++ b/src/ladspa_run_synth.o
diff --git a/src/midi/.deps/fluid_list.Plo b/src/midi/.deps/fluid_list.Plo
index 5b5edf9..1923619 100644
--- a/src/midi/.deps/fluid_list.Plo
+++ b/src/midi/.deps/fluid_list.Plo
@@ -3,7 +3,7 @@ fluid_list.lo: fluid_list.c /usr/include/stdc-predef.h fluid_list.h \
  /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h \
  /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
  /usr/include/endian.h /usr/include/bits/endian.h \
  /usr/include/bits/byteswap.h /usr/include/bits/types.h \
@@ -15,10 +15,10 @@ fluid_list.lo: fluid_list.c /usr/include/stdc-predef.h fluid_list.h \
  /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
  /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
  /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
  /usr/include/bits/stdio.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h \
  /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/sndfile.h \
  /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \
  /usr/include/bits/string2.h /usr/include/ladspa.h /usr/include/dssi.h \
@@ -51,7 +51,7 @@ fluid_midi.h:
 
 /usr/include/gnu/stubs-64.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h:
 
 /usr/include/bits/waitflags.h:
 
@@ -99,7 +99,7 @@ fluid_midi.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
@@ -107,7 +107,7 @@ fluid_midi.h:
 
 /usr/include/bits/stdio.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h:
 
 /usr/include/stdint.h:
 
diff --git a/src/midi/.deps/fluid_midi.Plo b/src/midi/.deps/fluid_midi.Plo
index 3de2838..3dde083 100644
--- a/src/midi/.deps/fluid_midi.Plo
+++ b/src/midi/.deps/fluid_midi.Plo
@@ -3,10 +3,10 @@ fluid_midi.lo: fluid_midi.c /usr/include/stdc-predef.h fluid_midi.h \
  /usr/include/sndfile.h /usr/include/stdio.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
  /usr/include/bits/stdio.h /usr/include/sys/types.h /usr/include/time.h \
  /usr/include/endian.h /usr/include/bits/endian.h \
@@ -17,7 +17,7 @@ fluid_midi.lo: fluid_midi.c /usr/include/stdc-predef.h fluid_midi.h \
  /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \
  /usr/include/bits/string2.h /usr/include/stdlib.h /usr/include/ladspa.h \
  /usr/include/dssi.h /usr/include/alsa/seq_event.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h \
  /usr/include/stdint.h /usr/include/bits/wchar.h \
  /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
  /usr/include/alloca.h /usr/include/bits/stdlib-bsearch.h \
@@ -56,7 +56,7 @@ fluid_list.h:
 
 /usr/include/gnu/stubs-64.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h:
 
 /usr/include/bits/types.h:
 
@@ -68,7 +68,7 @@ fluid_list.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
@@ -116,7 +116,7 @@ fluid_list.h:
 
 /usr/include/alsa/seq_event.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h:
 
 /usr/include/stdint.h:
 
diff --git a/src/midi/.deps/midi_loader.Plo b/src/midi/.deps/midi_loader.Plo
index f6b91a3..52eeb10 100644
--- a/src/midi/.deps/midi_loader.Plo
+++ b/src/midi/.deps/midi_loader.Plo
@@ -1,14 +1,14 @@
 midi_loader.lo: midi_loader.c /usr/include/stdc-predef.h midi_loader.h \
  fluid_list.h fluidsynth_priv.h fluid_midi_custom.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h \
  /usr/include/stdint.h /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h /usr/include/bits/wchar.h \
  /usr/include/stdio.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
  /usr/include/bits/stdio.h /usr/include/stdlib.h \
  /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
@@ -37,7 +37,7 @@ fluidsynth_priv.h:
 
 fluid_midi_custom.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h:
 
 /usr/include/stdint.h:
 
@@ -55,7 +55,7 @@ fluid_midi_custom.h:
 
 /usr/include/stdio.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h:
 
 /usr/include/bits/types.h:
 
@@ -67,7 +67,7 @@ fluid_midi_custom.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
diff --git a/src/midi/.deps/test_midi_loader.Po b/src/midi/.deps/test_midi_loader.Po
index 46719e6..6a06868 100644
--- a/src/midi/.deps/test_midi_loader.Po
+++ b/src/midi/.deps/test_midi_loader.Po
@@ -1,14 +1,14 @@
 test_midi_loader.o: test_midi_loader.c /usr/include/stdc-predef.h \
  midi_loader.h fluid_list.h fluidsynth_priv.h fluid_midi_custom.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h \
  /usr/include/stdint.h /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h /usr/include/bits/wchar.h \
  /usr/include/stdio.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
  /usr/include/bits/stdio.h /usr/include/stdlib.h \
  /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
@@ -37,7 +37,7 @@ fluidsynth_priv.h:
 
 fluid_midi_custom.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdint.h:
 
 /usr/include/stdint.h:
 
@@ -55,7 +55,7 @@ fluid_midi_custom.h:
 
 /usr/include/stdio.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stddef.h:
 
 /usr/include/bits/types.h:
 
@@ -67,7 +67,7 @@ fluid_midi_custom.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
diff --git a/src/midi/.libs/fluid_list.o b/src/midi/.libs/fluid_list.o
index 7a338c3..23cc1bd 100644
--- a/src/midi/.libs/fluid_list.o
+++ b/src/midi/.libs/fluid_list.o
diff --git a/src/midi/.libs/fluid_midi.o b/src/midi/.libs/fluid_midi.o
index 6f4f151..507d989 100644
--- a/src/midi/.libs/fluid_midi.o
+++ b/src/midi/.libs/fluid_midi.o
diff --git a/src/midi/.libs/libfluidmidi.a b/src/midi/.libs/libfluidmidi.a
index 7cb0b8c..d6786cd 100644
--- a/src/midi/.libs/libfluidmidi.a
+++ b/src/midi/.libs/libfluidmidi.a
diff --git a/src/midi/.libs/midi_loader.o b/src/midi/.libs/midi_loader.o
index c00226c..c29abed 100644
--- a/src/midi/.libs/midi_loader.o
+++ b/src/midi/.libs/midi_loader.o
diff --git a/src/midi/Makefile b/src/midi/Makefile
index e65bef3..5240831 100644
--- a/src/midi/Makefile
+++ b/src/midi/Makefile
@@ -208,6 +208,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
+LT_SYS_LIBRARY_PATH = 
 MAKEINFO = ${SHELL} /home/pepper/DSSI/dssi-render/missing makeinfo
 MANIFEST_TOOL = :
 MKDIR_P = /usr/bin/mkdir -p
diff --git a/src/midi/Makefile.in b/src/midi/Makefile.in
index f406eb8..277a1d2 100644
--- a/src/midi/Makefile.in
+++ b/src/midi/Makefile.in
@@ -208,6 +208,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
diff --git a/src/midi/fluid_list.lo b/src/midi/fluid_list.lo
index bbc909d..d64b0af 100644
--- a/src/midi/fluid_list.lo
+++ b/src/midi/fluid_list.lo
@@ -1,5 +1,5 @@
 # fluid_list.lo - a libtool object file
-# Generated by libtool (GNU libtool) 2.4.2
+# Generated by libtool (GNU libtool) 2.4.5
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
diff --git a/src/midi/fluid_list.o b/src/midi/fluid_list.o
index 7f329e4..4f31d1d 100644
--- a/src/midi/fluid_list.o
+++ b/src/midi/fluid_list.o
diff --git a/src/midi/fluid_midi.lo b/src/midi/fluid_midi.lo
index 09c84c0..e6c8f8c 100644
--- a/src/midi/fluid_midi.lo
+++ b/src/midi/fluid_midi.lo
@@ -1,5 +1,5 @@
 # fluid_midi.lo - a libtool object file
-# Generated by libtool (GNU libtool) 2.4.2
+# Generated by libtool (GNU libtool) 2.4.5
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
diff --git a/src/midi/fluid_midi.o b/src/midi/fluid_midi.o
index 4460e8d..4f88dbb 100644
--- a/src/midi/fluid_midi.o
+++ b/src/midi/fluid_midi.o
diff --git a/src/midi/libfluidmidi.la b/src/midi/libfluidmidi.la
index 8da7fe7..ba6337a 100644
--- a/src/midi/libfluidmidi.la
+++ b/src/midi/libfluidmidi.la
@@ -1,5 +1,5 @@
 # libfluidmidi.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2
+# Generated by libtool (GNU libtool) 2.4.5
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -13,7 +13,7 @@ library_names=''
 # The name of the static archive.
 old_library='libfluidmidi.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
diff --git a/src/midi/midi_loader.lo b/src/midi/midi_loader.lo
index a259e49..81ceea5 100644
--- a/src/midi/midi_loader.lo
+++ b/src/midi/midi_loader.lo
@@ -1,5 +1,5 @@
 # midi_loader.lo - a libtool object file
-# Generated by libtool (GNU libtool) 2.4.2
+# Generated by libtool (GNU libtool) 2.4.5
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
diff --git a/src/midi/midi_loader.o b/src/midi/midi_loader.o
index da224f4..259fb05 100644
--- a/src/midi/midi_loader.o
+++ b/src/midi/midi_loader.o
diff --git a/src/midi/test_midi_loader b/src/midi/test_midi_loader
index 2e9deb1..8edf797 100755
--- a/src/midi/test_midi_loader
+++ b/src/midi/test_midi_loader
diff --git a/src/midi/test_midi_loader.o b/src/midi/test_midi_loader.o
index b1a31b3..0128c31 100644
--- a/src/midi/test_midi_loader.o
+++ b/src/midi/test_midi_loader.o
diff --git a/src/valgrind_output b/src/valgrind_output
deleted file mode 100644
index 9ed6fef..0000000
--- a/src/valgrind_output
+++ /dev/null
@@ -1 +0,0 @@
-cli-dssi-host: Warning: port 1 (Tuning) was 0.000, overriding to 440.000