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

8 files changed, 51 insertions, 31 deletions

diff --git a/AUTHORS b/AUTHORS
index 1d57d23..0b92f3e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,3 +6,6 @@ Developer:
 
 Graphics, GUI design and logo:
  Lars Bisballe Jensen [muldjord] (muldjordlars@gmail.com)
+
+Patches:
+ John Hammen (sample multichannel support)
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 962fc53..9d0ffd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+Version 0.9.4
+==============
+Released March 5th 2014
+ - Add multichannel sample support. (John Hammen)
+ - Write README, ChangeLog and AUTHORS files. (deva)
+ - Delete old partially broken unit test system. (deva)
+ - Fix double click on toggle button to not leave the button in its middle state. (deva)
+ - Make plugin gui window fixed in size. (deva)
+ - Fix lineedit mouseclick to the right of the text, which should position text cursor to the right of the text. (unassigned)
+ - Handle sse optimisation toggling in configure.in. (suhr)
+ - Fix memory leak in Image class (png structure currently not free'd). (deva)
+ - Improve FileBrowser functionality. (suhr)
+ -   If filename lineedit is empty and the other one is not, use the non/empty lineedit path initially when opening filebrowser. (deva)
+ -   Make it possible to type a path and have the browser switch accordingly. (suhr)
+ -   Sort list by directories first and files next. (suhr)
+ -   Filter out non-drumkit files. (suhr)
+ -   Identify folders by appending '/' to their names. (suhr)
+ -   Remove double '\\' after drive letter in filebrowser on Windows. (suhr)
+ -   Test new filebrowser on Windows. (suhr)
+ -   Handle directory that can not be opened. (suhr)
+ -   Scrollbar is drawed wrong when few elements in list. (deva)
+ - Refactor GUI::EventHandler. (deva)
+ - Make Carla store plugin setting. (deva)
+ - Make it work in QTractor. (deva)
+ - Add jackaudio output module. (deva)
+ - Support multiple samplerates by resampling at load-time (feature request from Cédric 'SxDx'). (deva)
+ - Modernise autoconf. (deva)
+ - Add new unit test system. (deva)
+ - Find and fix LV2 midi velocities magically disappearing. (suhr) We can't reproduce this. Please contact us if you have this problem.
+
 Version 0.9.3
 ==============
 Released on May 7th 2013, ie. LAC 2013 version
diff --git a/configure.ac b/configure.ac
index 0562059..58b4eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,13 +36,6 @@ if test x$with_experimental == xyes; then
     CXXFLAGS="$CXXFLAGS -DEXPERIMENTAL"
 fi 
 
-#AC_ARG_ENABLE(pugl,  [  --enable-pugl             Build with Pugl support])
-#if test x$enable_pugl == xyes; then
-#    AC_MSG_WARN([*** Building with pugl support!])
-#    CXXFLAGS="$CXXFLAGS -DPUGL -lGL -lGLU -lglut"
-#fi 
-#AM_CONDITIONAL([ENABLE_PUGL], [test "x$enable_pugl" = "xyes"])
-
 dnl ===========================
 dnl Check for GUI backend
 dnl ===========================
@@ -93,7 +86,7 @@ elif test "x$enable_gui" = "xwin32"; then
 elif test "x$enable_gui" = "xpugl"; then
 
   AC_MSG_RESULT([Setting gui backend to Pugl])
-  GUI_CFLAGS="-DPUGL"
+  GUI_CFLAGS="-DPUGL -I../../pugl"
   GUI_LIBS="-lGLU -lGL -lglut"
 
 else 
@@ -105,18 +98,9 @@ AC_SUBST(GUI_LIBS)
 
 AM_CONDITIONAL([ENABLE_PUGL], [test "x$enable_gui" = "xpugl"])
 
-
-
-
-
-
-
-
-
-
-
-
-
+dnl ======================
+dnl Compile unit tests
+dnl ======================
 AC_ARG_WITH(test,  [  --with-test             Build unit tests])
 if test x$with_test == xyes; then
     AC_MSG_WARN([*** Building unittests!])
@@ -527,5 +511,5 @@ AC_OUTPUT(
 	drumgizmo/output/alsa/Makefile
 	drumgizmo/output/jackaudio/Makefile
 	drumgizmo/output/wavfile/Makefile
-  dgedit/Makefile)
-
+  dgedit/Makefile
+  dgedit/icons/Makefile)
diff --git a/dgedit/Makefile.am b/dgedit/Makefile.am
index 2ebd304..09bfe22 100644
--- a/dgedit/Makefile.am
+++ b/dgedit/Makefile.am
@@ -1,3 +1,6 @@
+SUBDIRS = icons
+DISTDIRS = icons
+
 if HAVE_EDITOR
 
 bin_PROGRAMS = dgedit
@@ -8,7 +11,7 @@ dgedit_LDADD = $(SNDFILE_LIBS) $(QT_LIBS) $(shell ../tools/MocList o ) \
 dgedit_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(QT_CFLAGS) $(AO_CFLAGS)
 AM_CXXFLAGS = $(QT_CFLAGS)
 
-dgedit_SOURCES = $(shell ../tools/MocList cc ) \
+dgedit_SOURCES = \
 	dgedit.cc \
 	audioextractor.cc \
 	canvas.cc \
@@ -21,8 +24,7 @@ dgedit_SOURCES = $(shell ../tools/MocList cc ) \
 	mainwindow.cc \
 	mipmap.cc \
 	samplesorter.cc \
-	dgedit.qrc \
-	dgedit_qrc.cpp
+	dgedit.qrc
 
 EXTRA_DIST = \
 	audioextractor.h \
diff --git a/dgedit/icons/Makefile.am b/dgedit/icons/Makefile.am
new file mode 100644
index 0000000..b838804
--- /dev/null
+++ b/dgedit/icons/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+	file.png \
+	master.png
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index e686ec0..9624b18 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST = \
 	midimapper.h \
 	mutex.h \
 	path.h \
+	powerlist.h \
 	rangemap.h \
 	sample.h \
 	saxparser.h \
@@ -53,6 +54,7 @@ EXTRA_DIST = \
 	midimapper.cc \
 	mutex.cc \
 	path.cc \
+	powerlist.cc \
 	sample.cc \
 	saxparser.cc \
 	semaphore.cc \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8cdf825..dc25608 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,3 @@
 EXTRA_DIST = \
-	Makefile.am.test \
 	MocList \
-	add_file \
-	test \
-	test.h \
-	testlist
\ No newline at end of file
+	add_file
\ No newline at end of file
diff --git a/vst/Makefile.mingw32 b/vst/Makefile.mingw32
index 48b515b..1d764df 100644
--- a/vst/Makefile.mingw32
+++ b/vst/Makefile.mingw32
@@ -35,7 +35,7 @@ DG_SRC = \
 	$(top_srcdir)/src/thread.cc \
 	$(top_srcdir)/src/velocity.cc \
 	$(top_srcdir)/src/versionstr.cc
-DG_CFLAGS = -I../include -I../src -DSSE -msse -msse2 -DDISABLE_HUGIN
+DG_CFLAGS = -I.. -I../include -I../src -DSSE -msse -msse2 -DDISABLE_HUGIN
 
 GUI_SRC = \
 	$(top_srcdir)/plugingui/nativewindow_x11.cc \