diff options
| author | Andy Wingo <wingo@pobox.com> | 2005-11-21 16:36:05 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2005-11-21 16:36:05 +0000 |
| commit | 0d470f58ca30d7b488e1f1cce1d7bf27bd3239b2 (patch) | |
| tree | 30fe63cecf438125f1d50d3e290c367c5855a95f /ext | |
| parent | bba99aa3da1aa594d6908d9d74f3679a8515aecd (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')
| -rw-r--r-- | ext/cairo/gsttextoverlay.c | 4 | ||||
| -rw-r--r-- | ext/flac/gstflacenc.c | 8 | ||||
| -rw-r--r-- | ext/gconf/gconf.c | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/ext/cairo/gsttextoverlay.c b/ext/cairo/gsttextoverlay.c index c358ba7e..a6a889bd 100644 --- a/ext/cairo/gsttextoverlay.c +++ b/ext/cairo/gsttextoverlay.c @@ -292,7 +292,7 @@ gst_text_overlay_set_property (GObject * object, guint prop_id, { GstTextOverlay *overlay = GST_TEXT_OVERLAY (object); - GST_LOCK (overlay); + GST_OBJECT_LOCK (overlay); switch (prop_id) { case ARG_TEXT:{ @@ -362,7 +362,7 @@ gst_text_overlay_set_property (GObject * object, guint prop_id, overlay->need_render = TRUE; - GST_UNLOCK (overlay); + GST_OBJECT_UNLOCK (overlay); } static void diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index f947a7b5..79f3de0b 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -707,7 +707,7 @@ gst_flacenc_set_property (GObject * object, guint prop_id, { GstFlacEnc *this = GST_FLACENC (object); - GST_LOCK (this); + GST_OBJECT_LOCK (this); switch (prop_id) { case PROP_QUALITY: @@ -766,7 +766,7 @@ gst_flacenc_set_property (GObject * object, guint prop_id, break; } - GST_UNLOCK (this); + GST_OBJECT_UNLOCK (this); } static void @@ -775,7 +775,7 @@ gst_flacenc_get_property (GObject * object, guint prop_id, { GstFlacEnc *this = GST_FLACENC (object); - GST_LOCK (this); + GST_OBJECT_LOCK (this); switch (prop_id) { case PROP_QUALITY: @@ -841,7 +841,7 @@ gst_flacenc_get_property (GObject * object, guint prop_id, break; } - GST_UNLOCK (this); + GST_OBJECT_UNLOCK (this); } static GstStateChangeReturn 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; } |