Adding WavPack support. Patch courtesy Kodest.

AUTHORS

@@ -24,6 +24,9 @@ Qball Cow <qballcow@gmail.com>
 Patrik Weiskircher <pat@icore.at>
 	Stored playlist commands
 
+Kodest <kodest at gmail dot com>
+	WavPack support
+
 Former Developers
 -----------------
 tw-nym

ChangeLog

@@ -9,6 +9,7 @@ ver 0.14.0 (????/??/??)
 * Make the shout output block while trying to connect instead of failing
 * New timeout parameter for shout outputs to define a connection timeout
 * New FIFO audio output
+* Support for WavPack files
 
 ver 0.13.0 (2007/5/28)
 * New JACK audio output

configure.ac

@@ -79,6 +79,7 @@ AC_ARG_ENABLE(aac,[  --disable-aac           disable AAC support (default: enabl
 AC_ARG_ENABLE(audiofile,[  --disable-audiofile     disable audiofile support, disables wave support (default: enable)],[enable_audiofile=$enableval],[enable_audiofile=yes])
 AC_ARG_ENABLE(mod,[  --enable-mod            enable MOD support (default: disable],[enable_mod=$enableval],[enable_mod=yes])
 AC_ARG_ENABLE(mpc,[  --disable-mpc           disable musepack (MPC) support (default: enable)],[enable_mpc=$enableval],[enable_mpc=yes])
+AC_ARG_ENABLE(wavpack,[  --disable-wavpack       disable wavpack support (default: enable)],[enable_wavpack=$enableval],[enable_wavpack=yes])
 AC_ARG_ENABLE(id3,[  --disable-id3           disable id3 support (default: enable)],[enable_id3=$enableval],[enable_id3=yes])
 AC_ARG_ENABLE(lsr,[  --disable-lsr           disable libsamplerate support (default: enable)],[enable_lsr=$enableval],[enable_lsr=yes])
 
@@ -182,7 +183,8 @@ if test x$enable_oss = xyes; then
 fi
 
 if test x$enable_pulse = xyes || test x$enable_jack = xyes ||
-   test x$enable_lsr = xyes || test x$with_zeroconf != xno; then
+   test x$enable_lsr = xyes || test x$with_zeroconf != xno ||
+   test x$enable_wavpack = xyes; then
 	PKG_PROG_PKG_CONFIG
 fi
 
@@ -368,6 +370,12 @@ if test x$enable_mpc = xyes; then
 	CPPFLAGS=$oldcppflags
 fi
 
+if test x$enable_wavpack = xyes; then
+	PKG_CHECK_MODULES([WAVPACK], [wavpack],
+	                  [enable_wavpack=yes;AC_DEFINE([HAVE_WAVPACK], 1, [Define to enable WavPack support])] MPD_LIBS="$MPD_LIBS $WAVPACK_LIBS" MPD_CFLAGS="$MPD_CFLAGS $WAVPACK_CFLAGS",
+	                  [enable_wavpack=no;AC_MSG_WARN([WavPack not found -- disabling])])
+fi
+
 MP4FF_SUBDIR=""
 
 if test x$enable_aac = xyes; then
@@ -764,6 +772,12 @@ else
 	echo " Musepack (MPC) support ........disabled"
 fi
 
+if test x$enable_wavpack = xyes; then
+	echo " WavPack support ...............enabled"
+else
+	echo " WavPack support ...............disabled"
+fi
+
 if test x$enable_mod = xyes; then
 	echo " MOD support ...................enabled"
 else
@@ -778,6 +792,7 @@ if
 	test x$enable_audiofile = xno && 
 	test x$enable_aac = xno &&
 	test x$enable_mpc = xno &&
+	test x$enable_wavpack = xno &&
 	test x$enable_mod = xno; then
 	AC_MSG_ERROR([No input plugins supported!])
 fi

src/Makefile.am

@@ -24,7 +24,8 @@ mpd_inputPlugins = \
 	inputPlugins/mod_plugin.c \
 	inputPlugins/mp3_plugin.c \
 	inputPlugins/mp4_plugin.c \
-	inputPlugins/mpc_plugin.c
+	inputPlugins/mpc_plugin.c \
+	inputPlugins/wavpack_plugin.c
 
 
 mpd_headers = \

src/inputPlugin.c

@@ -150,6 +150,7 @@ void initInputPlugins(void)
 	loadInputPlugin(&mp4Plugin);
 	loadInputPlugin(&aacPlugin);
 	loadInputPlugin(&mpcPlugin);
+	loadInputPlugin(&wavpackPlugin);
 	loadInputPlugin(&modPlugin);
 }
 

src/inputPlugin.h

@@ -104,6 +104,7 @@ extern InputPlugin audiofilePlugin;
 extern InputPlugin mp4Plugin;
 extern InputPlugin aacPlugin;
 extern InputPlugin mpcPlugin;
+extern InputPlugin wavpackPlugin;
 extern InputPlugin modPlugin;
 
 #endif