From 2e837743c3b4aab6a302df8dd0a47fbf79b58f9a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 21 Jun 2011 18:13:48 +0200 Subject: [PATCH] audio: clean up audiosink headers --- ext/alsa/gstalsasink.c | 4 ++-- gst-libs/gst/audio/gstaudiosink.c | 2 +- gst-libs/gst/audio/gstaudiosink.h | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c index 23b6d8c..9dc5b53 100644 --- a/ext/alsa/gstalsasink.c +++ b/ext/alsa/gstalsasink.c @@ -86,7 +86,7 @@ static gboolean gst_alsasink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec); static gboolean gst_alsasink_unprepare (GstAudioSink * asink); static gboolean gst_alsasink_close (GstAudioSink * asink); -static guint gst_alsasink_write (GstAudioSink * asink, gpointer data, +static gint gst_alsasink_write (GstAudioSink * asink, gpointer data, guint length); static guint gst_alsasink_delay (GstAudioSink * asink); static void gst_alsasink_reset (GstAudioSink * asink); @@ -846,7 +846,7 @@ xrun_recovery (GstAlsaSink * alsa, snd_pcm_t * handle, gint err) return err; } -static guint +static gint gst_alsasink_write (GstAudioSink * asink, gpointer data, guint length) { GstAlsaSink *alsa; diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c index 88c6f7b..68e7c99 100644 --- a/gst-libs/gst/audio/gstaudiosink.c +++ b/gst-libs/gst/audio/gstaudiosink.c @@ -191,7 +191,7 @@ gst_audioringbuffer_class_init (GstAudioRingBufferClass * klass) GST_DEBUG_FUNCPTR (gst_audioringbuffer_activate); } -typedef guint (*WriteFunc) (GstAudioSink * sink, gpointer data, guint length); +typedef gint (*WriteFunc) (GstAudioSink * sink, gpointer data, guint length); /* this internal thread does nothing else but write samples to the audio device. * It will write each segment in the ringbuffer and will update the play diff --git a/gst-libs/gst/audio/gstaudiosink.h b/gst-libs/gst/audio/gstaudiosink.h index 83a4e95..71fe5e4 100644 --- a/gst-libs/gst/audio/gstaudiosink.h +++ b/gst-libs/gst/audio/gstaudiosink.h @@ -83,9 +83,7 @@ struct _GstAudioSinkClass { /* close the device */ gboolean (*close) (GstAudioSink *sink); /* write samples to the device */ - /* FIXME 0.11: change return value to gint, as most implementation use that - * already anyway */ - guint (*write) (GstAudioSink *sink, gpointer data, guint length); + gint (*write) (GstAudioSink *sink, gpointer data, guint length); /* get number of samples queued in the device */ guint (*delay) (GstAudioSink *sink); /* reset the audio device, unblock from a write */ -- 2.7.4