summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/pulse/pulsesink.c8
-rw-r--r--ext/pulse/pulsesrc.c7
3 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ae7c73e1..1f266c13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 33b51d54..e434bf40 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 26e0897e..0e1ca20e 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