From: <th...@fr...> - 2005-08-01 21:17:16
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thaytan Date: Mon Aug 01 2005 14:17:14 PDT Log message: * 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. Modified files: . : ChangeLog gst/base : gstcollectpads.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.1324&r2=1.1325 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstcollectpads.c.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.1324 retrieving revision 1.1325 diff -u -d -r1.1324 -r1.1325 --- ChangeLog 1 Aug 2005 17:25:59 -0000 1.1324 +++ ChangeLog 1 Aug 2005 21:17:01 -0000 1.1325 @@ -1,4 +1,10 @@ 2005-08-01 Jan Schmidt <th...@ma...> + * 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 <th...@ma...> * gst/base/gstbasetransform.c: (gst_base_transform_init), (gst_base_transform_handle_buffer), (gst_base_transform_change_state): Index: gstcollectpads.c RCS file: /cvs/gstreamer/gstreamer/gst/base/gstcollectpads.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gstcollectpads.c 5 May 2005 09:31:59 -0000 1.1 +++ gstcollectpads.c 1 Aug 2005 21:17:01 -0000 1.2 @@ -84,6 +84,7 @@ { GstCollectPads *pads = GST_COLLECTPADS (object); + gst_collectpads_stop (pads); g_cond_free (pads->cond); /* FIXME, free data */ @@ -310,7 +311,7 @@ GST_LOCK (pads); pads->started = FALSE; - GST_COLLECTPADS_SIGNAL (pads); + GST_COLLECTPADS_BROADCAST (pads); GST_UNLOCK (pads); } |