From 23a2e7d7adad5ce71446e83134f0c84aba5393e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Sat, 26 Jan 2008 13:24:17 +0000
Subject: Add support for libsoundtouch 1.3.1 and add an ugly workaround for
 the header definined PACKAGE and other variables f...

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.
---
 ext/soundtouch/gstpitch.cc | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'ext/soundtouch')

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
-- 
cgit v1.2.1