diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-09-03 17:36:08 +0200 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-09-03 17:36:53 +0200 |
| commit | 8e5f0e37f8d776888af468097c98a8130f3db792 (patch) | |
| tree | 19ea3613a89a43cf6e7e5e140831cd0104a2a4fa | |
| parent | b54637edc4912f89a93c8b7d105f1e32da9913ee (diff) | |
| download | gstreamer-plugins-bad-8e5f0e37f8d776888af468097c98a8130f3db792.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.cc | 7 | ||||
| -rw-r--r-- | ext/soundtouch/gstpitch.cc | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ext/soundtouch/gstbpmdetect.cc b/ext/soundtouch/gstbpmdetect.cc index 79f765828..d32f219e3 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, " \ |