gst/base/gstcollectpads.c: Broadcast the condition when shutting down, to make sure...

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.

diff --git a/ChangeLog b/ChangeLog
index d1978c4..ede39c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2005-08-01  Jan Schmidt  <thaytan@mad.scientist.com>
+       * 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  <thaytan@mad.scientist.com>
        * gst/base/gstbasetransform.c: (gst_base_transform_init),
        (gst_base_transform_handle_buffer),
        (gst_base_transform_change_state):

diff --git a/gst/base/gstcollectpads.c b/gst/base/gstcollectpads.c
index 71965b8..d7824d0 100644 (file)
--- 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 71965b8..d7824d0 100644 (file)
--- 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);
 }