diff options
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | src/inputPlugins/mpc_plugin.c | 8 |
2 files changed, 21 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index fd9f4bd41..f10fb8022 100644 --- a/configure.ac +++ b/configure.ac @@ -276,38 +276,38 @@ if test x$enable_mp3 = xyes; then fi if test x$enable_mpc = xyes; then - if test "x$musepack_libraries" != "x" ; then - MUSEPACK_LIBS="-L$musepack_libraries" - elif test "x$musepack_prefix" != "x" ; then - MUSEPACK_LIBS="-L$faad_prefix/lib" + if test "x$mpcdec_libraries" != "x" ; then + MPCDEC_LIBS="-L$mpcdec_libraries" + elif test "x$mpcdec_prefix" != "x" ; then + MPCDEC_LIBS="-L$faad_prefix/lib" elif test "x$prefix" != "xNONE"; then - MUSEPACK_LIBS="-L$libdir" + MPCDEC_LIBS="-L$libdir" fi - MUSEPACK_LIBS="$MUSEPACK_LIBS -lmusepack" + MPCDEC_LIBS="$MPCDEC_LIBS -lmpcdec" - if test "x$musepack_includes" != "x" ; then - MUSEPACK_CFLAGS="-I$musepack_includes" - elif test "x$musepack_prefix" != "x" ; then - MUSEPACK_CFLAGS="-I$musepack_prefix/include" + if test "x$mpcdec_includes" != "x" ; then + MPCDEC_CFLAGS="-I$mpcdec_includes" + elif test "x$mpcdec_prefix" != "x" ; then + MPCDEC_CFLAGS="-I$mpcdec_prefix/include" elif test "x$prefix" != "xNONE"; then - MUSEPACK_CFLAGS="-I$includedir" + MPCDEC_CFLAGS="-I$includedir" fi oldcflags=$CFLAGS oldlibs=$LIBS oldcppflags=$CPPFLAGS - CFLAGS="$CFLAGS $MPD_CFLAGS $MUSEPACK_CFLAGS -I." - LIBS="$LIBS $MPD_LIBS $MUSEPACK_LIBS" + CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I." + LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS" CPPFLAGS=$CFLAGS - AC_CHECK_HEADER(musepack/musepack.h,,enable_mpc=no) + AC_CHECK_HEADER(mpcdec/mpcdec.h,,enable_mpc=no) if test x$enable_mpc = xyes; then - AC_CHECK_LIB(musepack,main,[MPD_LIBS="$MPD_LIBS $MUSEPACK_LIBS";MPD_CFLAGS="$MPD_CFLAGS $MUSEPACK_CFLAGS";],enable_mpc=no) + AC_CHECK_LIB(mpcdec,main,[MPD_LIBS="$MPD_LIBS $MPCDEC_LIBS";MPD_CFLAGS="$MPD_CFLAGS $MPCDEC_CFLAGS";],enable_mpc=no) fi if test x$enable_mpc = xyes; then - AC_DEFINE(HAVE_MUSEPACK,1,[Define to use libmusepack for MPC decoding]) + AC_DEFINE(HAVE_MPCDEC,1,[Define to use libmpcdec for MPC decoding]) else - AC_MSG_WARN([musepack lib needed for MPC support -- disabling MPC support]) + AC_MSG_WARN([mpcdec lib needed for MPC support -- disabling MPC support]) fi CFLAGS=$oldcflags LIBS=$oldlibs diff --git a/src/inputPlugins/mpc_plugin.c b/src/inputPlugins/mpc_plugin.c index f4c1aa8df..5e5cd3cfa 100644 --- a/src/inputPlugins/mpc_plugin.c +++ b/src/inputPlugins/mpc_plugin.c @@ -18,7 +18,7 @@ #include "../inputPlugin.h" -#ifdef HAVE_MUSEPACK +#ifdef HAVE_MPCDEC #include "../utils.h" #include "../audio.h" @@ -32,7 +32,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> -#include <musepack/musepack.h> +#include <mpcdec/mpcdec.h> #include <errno.h> #include <math.h> @@ -58,7 +58,7 @@ static mpc_int32_t mpc_read_cb(void * vdata, void * ptr, mpc_int32_t size) { return ret; } -static BOOL mpc_seek_cb(void * vdata, mpc_int32_t offset) { +static mpc_bool_t mpc_seek_cb(void * vdata, mpc_int32_t offset) { MpcCallbackData * data = (MpcCallbackData *)vdata; return seekInputStream(data->inStream , offset, SEEK_SET) < 0 ? 0 : 1; @@ -70,7 +70,7 @@ static mpc_int32_t mpc_tell_cb(void * vdata) { return (long)(data->inStream->offset); } -static BOOL mpc_canseek_cb(void * vdata) { +static mpc_bool_t mpc_canseek_cb(void * vdata) { MpcCallbackData * data = (MpcCallbackData *)vdata; return data->inStream->seekable; |