diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2008-10-03 16:13:32 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2008-10-03 16:13:32 +0000 |
| commit | 621dab2328c1828ab669c1903c576c74f6ea6b19 (patch) | |
| tree | 8d8aee0c56685cbf8952582871ab814e304471f5 | |
| parent | 419ede208d5ca0c8aac97a5b258d217f8abd03ce (diff) | |
| download | gstreamer-plugins-good-621dab2328c1828ab669c1903c576c74f6ea6b19.tar.gz | |
ext/pulse/: Return -1 instead of 0 in error cases. Fixes #554771.
Original commit message from CVS:
* ext/pulse/pulsesink.c: (gst_pulsesink_write):
* ext/pulse/pulsesrc.c: (gst_pulsesrc_read):
Return -1 instead of 0 in error cases. Fixes #554771.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/pulse/pulsesink.c | 8 | ||||
| -rw-r--r-- | ext/pulse/pulsesrc.c | 7 |
3 files changed, 16 insertions, 5 deletions
@@ -1,5 +1,11 @@ 2008-10-03 Wim Taymans <wim.taymans@collabora.co.uk> + * ext/pulse/pulsesink.c: (gst_pulsesink_write): + * ext/pulse/pulsesrc.c: (gst_pulsesrc_read): + Return -1 instead of 0 in error cases. Fixes #554771. + +2008-10-03 Wim Taymans <wim.taymans@collabora.co.uk> + * sys/ximage/gstximagesrc.c: (gst_ximage_src_start), (gst_ximage_src_stop), (gst_ximage_src_ximage_get): Stop leaking the cursor image. diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c index 33b51d543..e434bf409 100644 --- a/ext/pulse/pulsesink.c +++ b/ext/pulse/pulsesink.c @@ -717,10 +717,12 @@ gst_pulsesink_write (GstAudioSink * asink, gpointer data, guint length) return sum; + /* ERRORS */ unlock_and_fail: - - pa_threaded_mainloop_unlock (pulsesink->mainloop); - return 0; + { + pa_threaded_mainloop_unlock (pulsesink->mainloop); + return -1; + } } static guint diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c index 26e0897ea..0e1ca20e1 100644 --- a/ext/pulse/pulsesrc.c +++ b/ext/pulse/pulsesrc.c @@ -578,9 +578,12 @@ gst_pulsesrc_read (GstAudioSrc * asrc, gpointer data, guint length) return sum; + /* ERRORS */ unlock_and_fail: - pa_threaded_mainloop_unlock (pulsesrc->mainloop); - return 0; + { + pa_threaded_mainloop_unlock (pulsesrc->mainloop); + return -1; + } } static guint |