mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

soundtouch: fixes warnings on macosx snow leopard

Browse source
This commit is contained in:
Josep Torra 2009-10-11 14:10:59 +02:00
parent 14a83f3b3d
commit c3b3ca4be2
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/soundtouch/gstbpmdetect.cc
View file

@ -16,9 +16,6 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#define FLOAT_SAMPLES 1 #define FLOAT_SAMPLES 1
#include <soundtouch/BPMDetect.h> #include <soundtouch/BPMDetect.h>
@ -32,6 +29,11 @@
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
#undef PACKAGE #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/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <math.h> #include <math.h>
@ -47,7 +49,7 @@ struct _GstBPMDetectPrivate
{ {
gfloat bpm; gfloat bpm;
#if HAVE_SOUNDTOUCH_1_4 #if HAVE_SOUNDTOUCH_1_4
soundtouch::BPMDetect *detect; soundtouch::BPMDetect * detect;
#else #else
BPMDetect *detect; BPMDetect *detect;
#endif #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"); GST_ERROR_OBJECT (bpm_detect, "No channels or rate set yet");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
#if HAVE_SOUNDTOUCH_1_4 #if HAVE_SOUNDTOUCH_1_4
bpm_detect->priv->detect = bpm_detect->priv->detect =
new soundtouch::BPMDetect (filter->format.channels, filter->format.rate); new soundtouch::BPMDetect (filter->format.channels,
filter->format.rate);
#else #else
bpm_detect->priv->detect = bpm_detect->priv->detect =
new BPMDetect (filter->format.channels, filter->format.rate); new BPMDetect (filter->format.channels, filter->format.rate);
@ -223,7 +225,7 @@ gst_bpm_detect_transform_ip (GstBaseTransform * trans, GstBuffer * in)
inbuf += 2048; inbuf += 2048;
} }
} else { } else {
gfloat *inbuf, *intmp, data[2*2048]; gfloat *inbuf, *intmp, data[2 * 2048];
inbuf = (gfloat *) GST_BUFFER_DATA (in); inbuf = (gfloat *) GST_BUFFER_DATA (in);
intmp = data; intmp = data;

3
ext/soundtouch/gstpitch.cc
View file

@ -724,7 +724,8 @@ gst_pitch_process_segment (GstPitch * pitch, GstEvent ** event)
base = 0; 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); stop_value, format);
if (stream_time_ratio == 0) { if (stream_time_ratio == 0) {