summaryrefslogtreecommitdiff
path: root/libs/gst/base/gstcollectpads.c
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-01-19 09:27:04 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2012-01-19 09:27:04 +0100
commit252327f87a420a4f019a5731c6a214809c9a12cc (patch)
tree821a05f2eec6c720ba032331e0ddc94dc4aa4b63 /libs/gst/base/gstcollectpads.c
parent8af013f3346471abc92c4f660f7ff65638809d40 (diff)
Update for new gthread API
Diffstat (limited to 'libs/gst/base/gstcollectpads.c')
-rw-r--r--libs/gst/base/gstcollectpads.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c
index d02fd303f..1ad5015c0 100644
--- a/libs/gst/base/gstcollectpads.c
+++ b/libs/gst/base/gstcollectpads.c
@@ -119,7 +119,7 @@ gst_collect_pads_init (GstCollectPads * pads)
{
pads->priv = GST_COLLECT_PADS_GET_PRIVATE (pads);
- pads->cond = g_cond_new ();
+ g_cond_init (&pads->cond);
pads->data = NULL;
pads->cookie = 0;
pads->numpads = 0;
@@ -128,7 +128,7 @@ gst_collect_pads_init (GstCollectPads * pads)
pads->started = FALSE;
/* members to manage the pad list */
- pads->pad_lock = g_mutex_new ();
+ g_mutex_init (&pads->pad_lock);
pads->pad_cookie = 0;
pads->pad_list = NULL;
}
@@ -141,8 +141,8 @@ gst_collect_pads_finalize (GObject * object)
GST_DEBUG ("finalize");
- g_cond_free (pads->cond);
- g_mutex_free (pads->pad_lock);
+ g_cond_clear (&pads->cond);
+ g_mutex_clear (&pads->pad_lock);
/* Remove pads */
collected = pads->pad_list;