Merge branch 'master' of http://git.drumgizmo.org/drumgizmov0.9.7

Forced to write this message.

16 files changed, 76 insertions, 46 deletions

diff --git a/Makefile.am b/Makefile.am
index 87d364e..10ee6ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = gnu
-SUBDIRS = vst lv2 drumgizmo
+SUBDIRS = plugingui tools include src vst lv2 drumgizmo
 DISTDIRS = plugingui tools include src vst lv2 drumgizmo
 
 EXTRA_DIST = \
diff --git a/drumgizmo/audioinputenginedl.cc b/drumgizmo/audioinputenginedl.cc
index e7f19c6..93c7079 100644
--- a/drumgizmo/audioinputenginedl.cc
+++ b/drumgizmo/audioinputenginedl.cc
@@ -40,7 +40,7 @@ AudioInputEngineDL::AudioInputEngineDL(std::string name)
 {
   is_jack_plugin = strstr(name.c_str(), "jack");
 
-  std::string plugin = INPUT_PLUGIN_DIR"/lib" + name + ".so";
+  std::string plugin = INPUT_PLUGIN_DIR"/" + name + ".so";
   void *lib = dlopen(plugin.c_str(), RTLD_LAZY);
   if(!lib) {
     printf("Cannot load device: %s\n", dlerror());
diff --git a/drumgizmo/audiooutputenginedl.cc b/drumgizmo/audiooutputenginedl.cc
index 2648e8f..dad2c5c 100644
--- a/drumgizmo/audiooutputenginedl.cc
+++ b/drumgizmo/audiooutputenginedl.cc
@@ -35,7 +35,7 @@ AudioOutputEngineDL::AudioOutputEngineDL(std::string name)
 {
   is_jack_plugin = strstr(name.c_str(), "jack");
 
-  std::string plugin = OUTPUT_PLUGIN_DIR"/lib" + name + ".so";
+  std::string plugin = OUTPUT_PLUGIN_DIR"/" + name + ".so";
   void *lib = dlopen(plugin.c_str(), RTLD_LAZY);
   if(!lib) {
     printf("Cannot load device: %s\n", dlerror());
diff --git a/drumgizmo/input/dummy/Makefile.am b/drumgizmo/input/dummy/Makefile.am
index 6c40eb9..dfe0a57 100644
--- a/drumgizmo/input/dummy/Makefile.am
+++ b/drumgizmo/input/dummy/Makefile.am
@@ -4,7 +4,7 @@ dummysources = \
 
 if HAVE_INPUT_DUMMY
 
-dummyltlibs = libdummy.la
+dummyltlibs = dummy.la
 dummybuildsources = $(dummysources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(dummyltlibs)
 libdir = $(INPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-libdummy_la_LDFLAGS =
-libdummy_la_LIBADD =
-libdummy_la_SOURCES = $(dummybuildsources)
+dummy_la_LDFLAGS = -module -avoid-version -shared
+dummy_la_LIBADD =
+dummy_la_SOURCES = $(dummybuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/dummy.la
diff --git a/drumgizmo/input/jackmidi/Makefile.am b/drumgizmo/input/jackmidi/Makefile.am
index 809ca96..fd63944 100644
--- a/drumgizmo/input/jackmidi/Makefile.am
+++ b/drumgizmo/input/jackmidi/Makefile.am
@@ -8,7 +8,7 @@ jackmidisources = \
 
 if HAVE_INPUT_JACKMIDI
 
-jackmidiltlibs = libjackmidi.la
+jackmidiltlibs = jackmidi.la
 jackmidibuildsources = $(jackmidisources)
 
 else
@@ -25,6 +25,9 @@ lib_LTLIBRARIES = $(jackmidiltlibs)
 libdir = $(INPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/hugin
-libjackmidi_la_LDFLAGS =
-libjackmidi_la_LIBADD =
-libjackmidi_la_SOURCES = $(jackmidibuildsources)
+jackmidi_la_LDFLAGS = -module -avoid-version -shared
+jackmidi_la_LIBADD =
+jackmidi_la_SOURCES = $(jackmidibuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/jackmidi.la
diff --git a/drumgizmo/input/midifile/Makefile.am b/drumgizmo/input/midifile/Makefile.am
index da87f93..f95a289 100644
--- a/drumgizmo/input/midifile/Makefile.am
+++ b/drumgizmo/input/midifile/Makefile.am
@@ -9,7 +9,7 @@ midifilesources = \
 
 if HAVE_INPUT_MIDIFILE
 
-midifileltlibs = libmidifile.la
+midifileltlibs = midifile.la
 midifilebuildsources = $(midifilesources)
 
 else
@@ -27,6 +27,9 @@ libdir = $(INPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include $(SMF_CFLAGS) \
 	$(EXPAT_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX
-libmidifile_la_LDFLAGS = $(SMF_LIBS) $(EXPAT_LIBS)
-libmidifile_la_LIBADD =
-libmidifile_la_SOURCES = $(midifilebuildsources)
+midifile_la_LDFLAGS = $(SMF_LIBS) $(EXPAT_LIBS) -module -avoid-version -shared
+midifile_la_LIBADD =
+midifile_la_SOURCES = $(midifilebuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/midifile.la
diff --git a/drumgizmo/input/test/Makefile.am b/drumgizmo/input/test/Makefile.am
index 0b65a67..35466ab 100644
--- a/drumgizmo/input/test/Makefile.am
+++ b/drumgizmo/input/test/Makefile.am
@@ -4,7 +4,7 @@ testsources = \
 
 if HAVE_INPUT_TEST
 
-testltlibs = libtest.la
+testltlibs = test.la
 testbuildsources = $(testsources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(testltlibs)
 libdir = $(INPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-libtest_la_LDFLAGS =
-libtest_la_LIBADD =
-libtest_la_SOURCES = $(testbuildsources)
+test_la_LDFLAGS = -module -avoid-version -shared
+test_la_LIBADD = 
+test_la_SOURCES = $(testbuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/test.la
diff --git a/drumgizmo/output/alsa/Makefile.am b/drumgizmo/output/alsa/Makefile.am
index 6fff841..9f20844 100644
--- a/drumgizmo/output/alsa/Makefile.am
+++ b/drumgizmo/output/alsa/Makefile.am
@@ -4,7 +4,7 @@ alsasources = \
 
 if HAVE_OUTPUT_ALSA
 
-alsaltlibs = libalsa.la
+alsaltlibs = alsa.la
 alsabuildsources = $(alsasources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(alsaltlibs)
 libdir = $(OUTPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include $(ALSA_CFLAGS)
-libalsa_la_LDFLAGS = $(ALSA_LIBS)
-libalsa_la_LIBADD =
-libalsa_la_SOURCES = $(alsabuildsources)
+alsa_la_LDFLAGS = $(ALSA_LIBS) -module -avoid-version -shared
+alsa_la_LIBADD =
+alsa_la_SOURCES = $(alsabuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/alsa.la
diff --git a/drumgizmo/output/dummy/Makefile.am b/drumgizmo/output/dummy/Makefile.am
index 3037c1c..bff3daf 100644
--- a/drumgizmo/output/dummy/Makefile.am
+++ b/drumgizmo/output/dummy/Makefile.am
@@ -4,7 +4,7 @@ dummysources = \
 
 if HAVE_OUTPUT_DUMMY
 
-dummyltlibs = libdummy.la
+dummyltlibs = dummy.la
 dummybuildsources = $(dummysources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(dummyltlibs)
 libdir = $(OUTPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
-libdummy_la_LDFLAGS =
-libdummy_la_LIBADD =
-libdummy_la_SOURCES = $(dummybuildsources)
+dummy_la_LDFLAGS = -module -avoid-version -shared
+dummy_la_LIBADD =
+dummy_la_SOURCES = $(dummybuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/dummy.la
diff --git a/drumgizmo/output/jackaudio/Makefile.am b/drumgizmo/output/jackaudio/Makefile.am
index 453cad9..46cdb23 100644
--- a/drumgizmo/output/jackaudio/Makefile.am
+++ b/drumgizmo/output/jackaudio/Makefile.am
@@ -6,7 +6,7 @@ jackaudiosources = \
 
 if HAVE_OUTPUT_JACKAUDIO
 
-jackaudioltlibs = libjackaudio.la
+jackaudioltlibs = jackaudio.la
 jackaudiobuildsources = $(jackaudiosources)
 
 else
@@ -23,6 +23,9 @@ lib_LTLIBRARIES = $(jackaudioltlibs)
 libdir = $(OUTPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include $(JACK_CFLAGS) -I$(top_srcdir)/hugin -I$(top_srcdir)/src
-libjackaudio_la_LDFLAGS = $(JACK_LIBS)
-libjackaudio_la_LIBADD =
-libjackaudio_la_SOURCES = $(jackaudiobuildsources)
+jackaudio_la_LDFLAGS = $(JACK_LIBS) -module -avoid-version -shared
+jackaudio_la_LIBADD =
+jackaudio_la_SOURCES = $(jackaudiobuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/jackaudio.la
diff --git a/drumgizmo/output/wavfile/Makefile.am b/drumgizmo/output/wavfile/Makefile.am
index 732cc33..ae0eb76 100644
--- a/drumgizmo/output/wavfile/Makefile.am
+++ b/drumgizmo/output/wavfile/Makefile.am
@@ -4,7 +4,7 @@ wavfilesources = \
 
 if HAVE_OUTPUT_WAVFILE
 
-wavfileltlibs = libwavfile.la
+wavfileltlibs = wavfile.la
 wavfilebuildsources = $(wavfilesources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(wavfileltlibs)
 libdir = $(OUTPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include $(SNDFILE_CFLAGS)
-libwavfile_la_LDFLAGS = $(SNDFILE_LIBS)
-libwavfile_la_LIBADD =
-libwavfile_la_SOURCES = $(wavfilebuildsources)
+wavfile_la_LDFLAGS = $(SNDFILE_LIBS) -module -avoid-version -shared
+wavfile_la_LIBADD =
+wavfile_la_SOURCES = $(wavfilebuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/alsa.la
diff --git a/lv2/Makefile.am b/lv2/Makefile.am
index 9939131..10f079e 100644
--- a/lv2/Makefile.am
+++ b/lv2/Makefile.am
@@ -1,10 +1,12 @@
-if ENABLE_LV2
-
 include $(top_srcdir)/plugingui/Makefile.am.plugingui
 include $(top_srcdir)/src/Makefile.am.drumgizmo
 
 plugindir = $(prefix)/lib/lv2/drumgizmo.lv2
+
+if ENABLE_LV2
 plugin_LTLIBRARIES = drumgizmo.la
+endif
+
 plugin_DATA = manifest.ttl drumgizmo.ttl
 
 EXTRA_DIST = \
@@ -32,4 +34,3 @@ drumgizmo_la_SOURCES = \
 drumgizmo_la_LDFLAGS = -module -avoid-version
 drumgizmo_la_LIBADD = $(LV2_LIBS) $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS)
 
-endif
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am
index 3d09bb2..bdb11cb 100644
--- a/plugingui/Makefile.am
+++ b/plugingui/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = plugingui rcgen
+noinst_PROGRAMS = plugingui rcgen
 
 include Makefile.am.plugingui
 #include $(top_srcdir)/src/Makefile.am.drumgizmo
@@ -55,4 +55,6 @@ EXTRA_DIST = \
 	slider.h \
 	verticalline.h \
 	widget.h \
-	window.h
+	window.h \
+	lodepng/lodepng.h
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 9624b18..b9b0aae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = \
 	beatmapper.h \
 	channel.h \
 	channelmixer.h \
+	chresampler.h \
 	configuration.h \
 	configparser.h \
 	drumgizmo.h \
@@ -39,6 +40,7 @@ EXTRA_DIST = \
 	beatmapper.cc \
 	channel.cc \
 	channelmixer.cc \
+	chresampler.cc \
 	configuration.cc \
 	configparser.cc \
 	drumgizmo.cc \
diff --git a/version.h b/version.h
index db1b186..7a97893 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "0.9.6"
+#define VERSION "0.9.7"
diff --git a/vst/Makefile.am b/vst/Makefile.am
index e2a920c..7bb7214 100644
--- a/vst/Makefile.am
+++ b/vst/Makefile.am
@@ -11,7 +11,7 @@ VST_SOURCES = \
 AM_CPPFLAGS = -I$(top_srcdir)/hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX
 
 EXTRA_DIST = \
-	Makefile.mingw32 \
+	Makefile.mingw32.in \
 	constants.h \
 	drumgizmo_vst.cc \
 	drumgizmo_vst.h \
@@ -20,10 +20,9 @@ EXTRA_DIST = \
 	output_vst.cc \
 	output_vst.h
 
-plugindir = $(prefix)/vst
-plugin_LTLIBRARIES =
-
 if ENABLE_VST
+plugin_LTLIBRARIES =
+plugindir = $(prefix)/lib/vst
 plugin_LTLIBRARIES += libdrumgizmo_vst.la
 noinst_LTLIBRARIES = libdg.la
 endif
@@ -40,8 +39,10 @@ libdg_la_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/plugingui \
 	$(PLUGIN_GUI_CFLAGS) $(SSEFLAGS)\
 	-DUSE_THREAD $(SAMPLERATE_CFLAGS)
 
+nodist_libdrumgizmo_vst_la_SOURCES = \
+  $(VST_SOURCES)
+
 libdrumgizmo_vst_la_SOURCES = \
-  $(VST_SOURCES) \
 	drumgizmo_vst.cc \
 	input_vst.cc \
 	output_vst.cc