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

audio: clean up audiosink headers

Browse source
This commit is contained in:
Wim Taymans 2011-06-21 18:13:48 +02:00
parent d9e1e23094
commit 2e837743c3
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/alsa/gstalsasink.c
View file

@ -86,7 +86,7 @@ static gboolean gst_alsasink_prepare (GstAudioSink * asink,
GstRingBufferSpec * spec); GstRingBufferSpec * spec);
static gboolean gst_alsasink_unprepare (GstAudioSink * asink); static gboolean gst_alsasink_unprepare (GstAudioSink * asink);
static gboolean gst_alsasink_close (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); guint length);
static guint gst_alsasink_delay (GstAudioSink * asink); static guint gst_alsasink_delay (GstAudioSink * asink);
static void gst_alsasink_reset (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; return err;
} }
static guint static gint
gst_alsasink_write (GstAudioSink * asink, gpointer data, guint length) gst_alsasink_write (GstAudioSink * asink, gpointer data, guint length)
{ {
GstAlsaSink *alsa; GstAlsaSink *alsa;

2
gst-libs/gst/audio/gstaudiosink.c
View file

@ -191,7 +191,7 @@ gst_audioringbuffer_class_init (GstAudioRingBufferClass * klass)
GST_DEBUG_FUNCPTR (gst_audioringbuffer_activate); 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. /* 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 * It will write each segment in the ringbuffer and will update the play

4
gst-libs/gst/audio/gstaudiosink.h
View file

@ -83,9 +83,7 @@ struct _GstAudioSinkClass {
/* close the device */ /* close the device */
gboolean (*close) (GstAudioSink *sink); gboolean (*close) (GstAudioSink *sink);
/* write samples to the device */ /* write samples to the device */
/* FIXME 0.11: change return value to gint, as most implementation use that gint (*write) (GstAudioSink *sink, gpointer data, guint length);
* already anyway */
guint (*write) (GstAudioSink *sink, gpointer data, guint length);
/* get number of samples queued in the device */ /* get number of samples queued in the device */
guint (*delay) (GstAudioSink *sink); guint (*delay) (GstAudioSink *sink);
/* reset the audio device, unblock from a write */ /* reset the audio device, unblock from a write */