From 0d470f58ca30d7b488e1f1cce1d7bf27bd3239b2 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 21 Nov 2005 16:36:05 +0000 Subject: *.*: Ran scripts/update-macros. Oh yes. Original commit message from CVS: 2005-11-21 Andy Wingo * *.h: * *.c: Ran scripts/update-macros. Oh yes. --- ext/gconf/gconf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ext/gconf') diff --git a/ext/gconf/gconf.c b/ext/gconf/gconf.c index bbd327cc..5ea8ecef 100644 --- a/ext/gconf/gconf.c +++ b/ext/gconf/gconf.c @@ -55,33 +55,33 @@ gst_bin_find_unconnected_pad (GstBin * bin, GstPadDirection direction) const GList *pads = NULL; GstElement *element = NULL; - GST_LOCK (bin); + GST_OBJECT_LOCK (bin); elements = bin->children; /* traverse all elements looking for unconnected pads */ while (elements && pad == NULL) { element = GST_ELEMENT (elements->data); - GST_LOCK (element); + GST_OBJECT_LOCK (element); pads = element->pads; while (pads) { GstPad *testpad = GST_PAD (pads->data); /* check if the direction matches */ if (GST_PAD_DIRECTION (testpad) == direction) { - GST_LOCK (testpad); + GST_OBJECT_LOCK (testpad); if (GST_PAD_PEER (testpad) == NULL) { - GST_UNLOCK (testpad); + GST_OBJECT_UNLOCK (testpad); /* found it ! */ pad = testpad; break; } - GST_UNLOCK (testpad); + GST_OBJECT_UNLOCK (testpad); } pads = g_list_next (pads); } - GST_UNLOCK (element); + GST_OBJECT_UNLOCK (element); elements = g_list_next (elements); } - GST_UNLOCK (bin); + GST_OBJECT_UNLOCK (bin); return pad; } -- cgit