diff options
| author | Josep Torra <n770galaxy@gmail.com> | 2009-10-11 14:10:59 +0200 |
|---|---|---|
| committer | Josep Torra <n770galaxy@gmail.com> | 2009-10-11 14:10:59 +0200 |
| commit | c3b3ca4be2141939a82455437cca0227afa73a81 (patch) | |
| tree | 3d588d75cc9b21a6d3c4b55572c3bc7d5649747c /ext/soundtouch | |
| parent | 14a83f3b3d9feb98d429707a5bcaeeb05fda6214 (diff) | |
| download | gstreamer-plugins-bad-c3b3ca4be2141939a82455437cca0227afa73a81.tar.gz | |
soundtouch: fixes warnings on macosx snow leopard
Diffstat (limited to 'ext/soundtouch')
| -rw-r--r-- | ext/soundtouch/gstbpmdetect.cc | 16 | ||||
| -rw-r--r-- | ext/soundtouch/gstpitch.cc | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/ext/soundtouch/gstbpmdetect.cc b/ext/soundtouch/gstbpmdetect.cc index 23dfc1852..56ba087cd 100644 --- a/ext/soundtouch/gstbpmdetect.cc +++ b/ext/soundtouch/gstbpmdetect.cc @@ -16,9 +16,6 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #define FLOAT_SAMPLES 1 #include <soundtouch/BPMDetect.h> @@ -32,6 +29,11 @@ #undef PACKAGE_BUGREPORT #undef PACKAGE +/* FIXME: keep it here to avoid PACKAGE* redefinition warnings */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <gst/audio/audio.h> #include <gst/audio/gstaudiofilter.h> #include <math.h> @@ -47,7 +49,7 @@ struct _GstBPMDetectPrivate { gfloat bpm; #if HAVE_SOUNDTOUCH_1_4 - soundtouch::BPMDetect *detect; + soundtouch::BPMDetect * detect; #else BPMDetect *detect; #endif @@ -199,10 +201,10 @@ gst_bpm_detect_transform_ip (GstBaseTransform * trans, GstBuffer * in) GST_ERROR_OBJECT (bpm_detect, "No channels or rate set yet"); return GST_FLOW_ERROR; } - #if HAVE_SOUNDTOUCH_1_4 bpm_detect->priv->detect = - new soundtouch::BPMDetect (filter->format.channels, filter->format.rate); + new soundtouch::BPMDetect (filter->format.channels, + filter->format.rate); #else bpm_detect->priv->detect = new BPMDetect (filter->format.channels, filter->format.rate); @@ -223,7 +225,7 @@ gst_bpm_detect_transform_ip (GstBaseTransform * trans, GstBuffer * in) inbuf += 2048; } } else { - gfloat *inbuf, *intmp, data[2*2048]; + gfloat *inbuf, *intmp, data[2 * 2048]; inbuf = (gfloat *) GST_BUFFER_DATA (in); intmp = data; diff --git a/ext/soundtouch/gstpitch.cc b/ext/soundtouch/gstpitch.cc index bebf13cf2..a1e0cb638 100644 --- a/ext/soundtouch/gstpitch.cc +++ b/ext/soundtouch/gstpitch.cc @@ -724,7 +724,8 @@ gst_pitch_process_segment (GstPitch * pitch, GstEvent ** event) base = 0; } - GST_LOG_OBJECT (pitch->sinkpad, "segment %lld - %lld (%d)", start_value, + GST_LOG_OBJECT (pitch->sinkpad, + "segment %" G_GINT64_FORMAT " - %" G_GINT64_FORMAT " (%d)", start_value, stop_value, format); if (stream_time_ratio == 0) { |