diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | ext/soundtouch/gstpitch.cc | 15 |
3 files changed, 25 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2008-01-26 Sebastian Dröge <slomo@circular-chaos.org> + + * configure.ac: + * ext/soundtouch/gstpitch.cc: + Add support for libsoundtouch 1.3.1 and add an ugly workaround for + the header definined PACKAGE and other variables for which we need + our own values from config.h. + 2008-01-26 Tim-Philipp Müller <tim at centricular dot net> * configure.ac: diff --git a/configure.ac b/configure.ac index 66992b06..f2477cef 100644 --- a/configure.ac +++ b/configure.ac @@ -885,9 +885,11 @@ AG_GST_CHECK_FEATURE(SNDFILE, [sndfile plug-in], sfsrc sfsink, [ dnl *** soundtouch *** translit(dnm, m, l) AM_CONDITIONAL(USE_SOUNDTOUCH, true) AG_GST_CHECK_FEATURE(SOUNDTOUCH, [soundtouch plug-in], soundtouch, [ - PKG_CHECK_MODULES(SOUNDTOUCH, libSoundTouch, HAVE_SOUNDTOUCH=yes, [ - HAVE_SOUNDTOUCH=no - AC_MSG_RESULT(no)]) + PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0, + HAVE_SOUNDTOUCH=yes, + PKG_CHECK_MODULES(SOUNDTOUCH, libSoundTouch, + HAVE_SOUNDTOUCH=yes, + HAVE_SOUNDTOUCH=no)) AC_SUBST(SOUNDTOUCH_CFLAGS) AC_SUBST(SOUNDTOUCH_LIBS) if test "x$HAVE_CXX" != "xyes"; then diff --git a/ext/soundtouch/gstpitch.cc b/ext/soundtouch/gstpitch.cc index ad53f477..38c7d2d3 100644 --- a/ext/soundtouch/gstpitch.cc +++ b/ext/soundtouch/gstpitch.cc @@ -17,6 +17,18 @@ * */ +#define FLOAT_SAMPLES 1 +#include <soundtouch/SoundTouch.h> +/* FIXME: workaround for SoundTouch.h of version 1.3.1 defining those + * variables while it shouldn't. */ +#undef VERSION +#undef PACKAGE_VERSION +#undef PACKAGE_TARNAME +#undef PACKAGE_STRING +#undef PACKAGE_NAME +#undef PACKAGE_BUGREPORT +#undef PACKAGE + #ifdef HAVE_CONFIG_H # include <config.h> #endif @@ -26,9 +38,6 @@ #include "gstpitch.hh" #include <math.h> -#define FLOAT_SAMPLES -#include <soundtouch/SoundTouch.h> - /* wtf ? #ifdef G_PARAM_READWRITE # undef G_PARAM_READWRITE |