From 75c955843e4294d6082dd8ee78c59852c8ff2b1e Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 1 Aug 2005 21:17:01 +0000 Subject: [PATCH] gst/base/gstcollectpads.c: Broadcast the condition when shutting down, to make sure we wake all threads up. Shut down... Original commit message from CVS: * gst/base/gstcollectpads.c: (gst_collectpads_finalize), (gst_collectpads_stop): Broadcast the condition when shutting down, to make sure we wake all threads up. Shut down pads on finalize, for safety. --- ChangeLog | 6 ++++++ gst/base/gstcollectpads.c | 3 ++- libs/gst/base/gstcollectpads.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1978c4364..ede39c7d7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-08-01 Jan Schmidt + * gst/base/gstcollectpads.c: (gst_collectpads_finalize), + (gst_collectpads_stop): + Broadcast the condition when shutting down, to make sure we wake all + threads up. Shut down pads on finalize, for safety. + 2005-08-01 Jan Schmidt * gst/base/gstbasetransform.c: (gst_base_transform_init), (gst_base_transform_handle_buffer), diff --git a/gst/base/gstcollectpads.c b/gst/base/gstcollectpads.c index 71965b8b25..d7824d0079 100644 --- a/gst/base/gstcollectpads.c +++ b/gst/base/gstcollectpads.c @@ -84,6 +84,7 @@ gst_collectpads_finalize (GObject * object) { GstCollectPads *pads = GST_COLLECTPADS (object); + gst_collectpads_stop (pads); g_cond_free (pads->cond); /* FIXME, free data */ @@ -310,7 +311,7 @@ gst_collectpads_stop (GstCollectPads * pads) GST_LOCK (pads); pads->started = FALSE; - GST_COLLECTPADS_SIGNAL (pads); + GST_COLLECTPADS_BROADCAST (pads); GST_UNLOCK (pads); } diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c index 71965b8b25..d7824d0079 100644 --- a/libs/gst/base/gstcollectpads.c +++ b/libs/gst/base/gstcollectpads.c @@ -84,6 +84,7 @@ gst_collectpads_finalize (GObject * object) { GstCollectPads *pads = GST_COLLECTPADS (object); + gst_collectpads_stop (pads); g_cond_free (pads->cond); /* FIXME, free data */ @@ -310,7 +311,7 @@ gst_collectpads_stop (GstCollectPads * pads) GST_LOCK (pads); pads->started = FALSE; - GST_COLLECTPADS_SIGNAL (pads); + GST_COLLECTPADS_BROADCAST (pads); GST_UNLOCK (pads); }