summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2013-09-03 17:36:08 +0200
committerSebastian Dröge <slomo@circular-chaos.org>2013-09-03 17:37:23 +0200
commit9f9f2ce9af43390e5f09d43b774d3d347f6ed7be (patch)
treeae3b5dcc620a152494cdde72ae794cdf3b5ac4c2
parent18be33389a78afaa4c0377db057af33d175bb2d2 (diff)
downloadgstreamer-plugins-bad-9f9f2ce9af43390e5f09d43b774d3d347f6ed7be.tar.gz
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
-rw-r--r--ext/soundtouch/gstbpmdetect.cc7
-rw-r--r--ext/soundtouch/gstpitch.cc7
2 files changed, 14 insertions, 0 deletions
diff --git a/ext/soundtouch/gstbpmdetect.cc b/ext/soundtouch/gstbpmdetect.cc
index 8d6239cee..64c06903b 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 1235b310a..1773acfaf 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, " \