summaryrefslogtreecommitdiffstats
path: root/ext/gconf
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2005-11-21 16:36:05 +0000
committerAndy Wingo <wingo@pobox.com>2005-11-21 16:36:05 +0000
commit0d470f58ca30d7b488e1f1cce1d7bf27bd3239b2 (patch)
tree30fe63cecf438125f1d50d3e290c367c5855a95f /ext/gconf
parentbba99aa3da1aa594d6908d9d74f3679a8515aecd (diff)
*.*: Ran scripts/update-macros. Oh yes.
Original commit message from CVS: 2005-11-21 Andy Wingo <wingo@pobox.com> * *.h: * *.c: Ran scripts/update-macros. Oh yes.
Diffstat (limited to 'ext/gconf')
-rw-r--r--ext/gconf/gconf.c14
1 files changed, 7 insertions, 7 deletions
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;
}