mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

Add support for libsoundtouch 1.3.1 and add an ugly workaround for the header definined PACKAGE and other variables f...

Browse source 
Original commit message from CVS:
* 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.
This commit is contained in:
Sebastian Dröge 2008-01-26 13:24:17 +00:00
parent 3a5db6a932
commit 23a2e7d7ad
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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:

8
configure.ac
View file

@ -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

15
ext/soundtouch/gstpitch.cc
View file

@ -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