From 8e5f0e37f8d776888af468097c98a8130f3db792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 3 Sep 2013 17:36:08 +0200 Subject: [PATCH] soundtouch: Fix compilation with soundtouch 1.4.0 It used FLOAT_SAMPLES/INTEGER_SAMPLES #defines instead of ones properly prefixed with a namespace. https://bugzilla.gnome.org/show_bug.cgi?id=707390 --- ext/soundtouch/gstbpmdetect.cc | 7 +++++++ ext/soundtouch/gstpitch.cc | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/ext/soundtouch/gstbpmdetect.cc b/ext/soundtouch/gstbpmdetect.cc index 79f765828d..d32f219e3c 100644 --- a/ext/soundtouch/gstbpmdetect.cc +++ b/ext/soundtouch/gstbpmdetect.cc @@ -54,6 +54,13 @@ struct _GstBPMDetectPrivate #endif }; +/* For soundtouch 1.4 */ +#if defined(INTEGER_SAMPLES) +#define SOUNDTOUCH_INTEGER_SAMPLES 1 +#elif defined(FLOAT_SAMPLES) +#define SOUNDTOUCH_FLOAT_SAMPLES 1 +#endif + #if defined(SOUNDTOUCH_FLOAT_SAMPLES) #define ALLOWED_CAPS \ "audio/x-raw, " \ diff --git a/ext/soundtouch/gstpitch.cc b/ext/soundtouch/gstpitch.cc index 1235b310a1..1773acfaf6 100644 --- a/ext/soundtouch/gstpitch.cc +++ b/ext/soundtouch/gstpitch.cc @@ -61,6 +61,13 @@ enum ARG_PITCH }; +/* For soundtouch 1.4 */ +#if defined(INTEGER_SAMPLES) +#define SOUNDTOUCH_INTEGER_SAMPLES 1 +#elif defined(FLOAT_SAMPLES) +#define SOUNDTOUCH_FLOAT_SAMPLES 1 +#endif + #if defined(SOUNDTOUCH_FLOAT_SAMPLES) #define SUPPORTED_CAPS \ "audio/x-raw, " \