few compile fixes; added mono2stereo into tarball

10 files changed, 24 insertions, 31 deletions

diff --git a/configure.ac b/configure.ac
index 842406df..9e2b179d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,7 @@ AC_ARG_ENABLE(artwork-imlib2, [AS_HELP_STRING([--enable-artwork-imlib2      ], [
 AC_ARG_ENABLE(dumb,      [AS_HELP_STRING([--enable-dumb      ], [build DUMB plugin (default: auto)])], [enable_dumb=$enableval], [enable_dumb=yes])
 AC_ARG_ENABLE(shn,      [AS_HELP_STRING([--enable-shn      ], [build SHN plugin (default: auto)])], [enable_shn=$enableval], [enable_shn=yes])
 AC_ARG_ENABLE(psf,      [AS_HELP_STRING([--enable-psf      ], [build AOSDK-based PSF(,QSF,SSF,DSF) plugin (default: auto)])], [enable_psf=$enableval], [enable_psf=yes])
+AC_ARG_ENABLE(mono2stereo,      [AS_HELP_STRING([--enable-mono2stereo      ], [build mono2stereo DSP plugin (default: auto)])], [enable_mono2stereo=$enableval], [enable_mono2stereo=yes])
 
 if test "x$enable_staticlink" != "xno" ; then
     AC_DEFINE_UNQUOTED([STATICLINK], [1], [Define if building static version])
@@ -562,7 +563,11 @@ if test "x$enable_psf" != "xno" ; then
     HAVE_PSF=yes
 fi
 
-PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao"
+if test "x$enable_mono2stereo" != "xno" ; then
+    HAVE_MONO2STEREO=yes
+fi
+
+PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo"
 
 AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
@@ -610,6 +615,7 @@ AM_CONDITIONAL(HAVE_YASM, test "x$HAVE_YASM" = "xyes")
 AM_CONDITIONAL(HAVE_DUMB, test "x$HAVE_DUMB" = "xyes")
 AM_CONDITIONAL(HAVE_PSF, test "x$HAVE_PSF" = "xyes")
 AM_CONDITIONAL(HAVE_SHN, test "x$HAVE_SHN" = "xyes")
+AM_CONDITIONAL(HAVE_MONO2STEREO, test "x$HAVE_MONO2STEREO" = "xyes")
 
 AC_SUBST(PLUGINS_DIRS)
 
@@ -673,6 +679,7 @@ PRINT_PLUGIN_INFO([converter],[plugin for converting files to any formats],[test
 PRINT_PLUGIN_INFO([psf],[PSF format plugin, using AOSDK],[test "x$HAVE_PSF" = "xyes"])
 PRINT_PLUGIN_INFO([dumb],[DUMB module plugin, for MOD, S3M, etc],[test "x$HAVE_DUMB" = "xyes"])
 PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn],[test "x$HAVE_SHN" = "xyes"])
+PRINT_PLUGIN_INFO([mono2stereo],[mono2stereo DSP plugin],[test "x$HAVE_MONO2STEREO" = "xyes"])
 
 echo
 
@@ -717,6 +724,7 @@ plugins/converter/Makefile
 plugins/dumb/Makefile
 plugins/ao/Makefile
 plugins/shn/Makefile
+plugins/mono2stereo/Makefile
 intl/Makefile
 po/Makefile.in
 deadbeef.desktop
diff --git a/messagepump.h b/messagepump.h
index 30f43c5e..b044b72c 100644
--- a/messagepump.h
+++ b/messagepump.h
@@ -19,7 +19,7 @@
 #define __MESSAGEPUMP_H
 
 #include <stdint.h>
-#include <deadbeef.h>
+#include "deadbeef.h"
 
 int messagepump_init (void);
 void messagepump_free (void);
diff --git a/plugins/ao/main.c b/plugins/ao/main.c
index 18067410..a4da36d0 100644
--- a/plugins/ao/main.c
+++ b/plugins/ao/main.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 
 #include "ao.h"
 #include "eng_protos.h"
diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c
index 65b3e1c8..dee8c4a6 100644
--- a/plugins/ao/plugin.c
+++ b/plugins/ao/plugin.c
@@ -18,7 +18,7 @@
 */
 #include <stdlib.h>
 #include <string.h>
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 #include "ao.h"
 #include "eng_protos.h"
 
diff --git a/plugins/dumb/cdumb.c b/plugins/dumb/cdumb.c
index f947d94a..0ae7f4d4 100644
--- a/plugins/dumb/cdumb.c
+++ b/plugins/dumb/cdumb.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include "dumb.h"
 #include "internal/it.h"
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
diff --git a/plugins/mono2stereo/Makefile b/plugins/mono2stereo/Makefile
deleted file mode 100644
index 0dceaa3a..00000000
--- a/plugins/mono2stereo/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-CC?=gcc
-
-CFLAGS+=-Wall -fPIC -D_GNU_SOURCE -std=c99
-
-LDFLAGS+=-module -shared -lm
-
-SOURCES=mono2stereo.c
-
-OBJECTS=$(SOURCES:.c=.o)
-
-OUT?=ddb_mono2stereo.so
-
-all: $(SOURCES) $(OUT)
-
-$(OUT): $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
-
-.c.o:
-	$(CC) $(CFLAGS) $< -c -o $@
-
-clean:
-	rm $(OBJECTS) $(OUT)
-
diff --git a/plugins/mono2stereo/Makefile.am b/plugins/mono2stereo/Makefile.am
new file mode 100644
index 00000000..ccbbf846
--- /dev/null
+++ b/plugins/mono2stereo/Makefile.am
@@ -0,0 +1,8 @@
+if HAVE_MONO2STEREO
+pkglib_LTLIBRARIES = ddb_mono2stereo.la
+ddb_mono2stereo_la_SOURCES = mono2stereo.c
+ddb_mono2stereo_la_LDFLAGS = -module
+
+ddb_mono2stereo_la_LIBADD = $(LDADD)
+AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/mono2stereo/mono2stereo.c b/plugins/mono2stereo/mono2stereo.c
index 23d0b0d5..66168bed 100644
--- a/plugins/mono2stereo/mono2stereo.c
+++ b/plugins/mono2stereo/mono2stereo.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 
 enum {
     M2S_PARAM_LEFTMIX,
diff --git a/plugins/shn/shn.c b/plugins/shn/shn.c
index 504f283c..c9d4acaf 100644
--- a/plugins/shn/shn.c
+++ b/plugins/shn/shn.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "shorten.h"
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 #include "bitshift.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
diff --git a/scripts/quickinstall.sh b/scripts/quickinstall.sh
index 1681e2b2..0528ae7c 100755
--- a/scripts/quickinstall.sh
+++ b/scripts/quickinstall.sh
@@ -43,4 +43,4 @@ cp ./plugins/converter/.libs/converter_gtk2.so /usr/local/lib/deadbeef/
 cp ./plugins/converter/.libs/converter_gtk3.so /usr/local/lib/deadbeef/
 cp ./plugins/soundtouch/ddb_soundtouch.so /usr/local/lib/deadbeef/
 cp ./plugins/vfs_zip/.libs/vfs_zip.so /usr/local/lib/deadbeef/
-cp ./plugins/mono2stereo/mono2stereo.so /usr/local/lib/deadbeef/
+cp ./plugins/mono2stereo/.libs/ddb_mono2stereo.so /usr/local/lib/deadbeef/