From 8e96015d9573773278880b1305109a87efb0a0c5 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 1 Oct 2002 11:42:32 +0000 Subject: [PATCH] code cleanup and more debug output Original commit message from CVS: code cleanup and more debug output --- gst/gstcaps.c | 9 ++++++--- gst/gstelement.c | 23 ++++++++++++++++------- gst/gstpad.c | 5 +++-- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/gst/gstcaps.c b/gst/gstcaps.c index d86d1d5ac2..f4bce5b5b4 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -662,7 +662,7 @@ gst_caps_intersect_func (GstCaps *caps1, GstCaps *caps2) GstProps *props; if (caps1->id != caps2->id) { - GST_DEBUG (GST_CAT_CAPS,"mime types differ (%s to %s)", + GST_DEBUG (GST_CAT_CAPS, "mime types differ (%s to %s)", gst_type_find_by_id (caps1->id)->mime, gst_type_find_by_id (caps2->id)->mime); return NULL; @@ -685,8 +685,8 @@ gst_caps_intersect_func (GstCaps *caps1, GstCaps *caps2) /** * gst_caps_intersect: - * @caps1: a capabilty - * @caps2: a capabilty + * @caps1: a capability + * @caps2: a capability * * Make the intersection between two caps. * @@ -698,6 +698,9 @@ gst_caps_intersect (GstCaps *caps1, GstCaps *caps2) { GstCaps *result = NULL, *walk = NULL; + /* printing the name is not useful here since caps can be chained */ + GST_DEBUG (GST_CAT_CAPS, "intersecting caps %p and %p", caps1, caps2); + if (caps1 == NULL) { GST_DEBUG (GST_CAT_CAPS, "first caps is NULL, return other caps"); return gst_caps_copy (caps2); diff --git a/gst/gstelement.c b/gst/gstelement.c index c899593a22..2583b6387a 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -474,7 +474,11 @@ gst_element_set_valist (GstElement *element, const gchar *first_property_name, v g_return_if_fail (GST_IS_ELEMENT (element)); - object = (GObject*)element; + object = (GObject *) element; + + GST_DEBUG (GST_CAT_PROPERTIES, + "setting valist of properties starting with %s on element %s", + first_property_name, gst_element_get_name (element)); if (!GST_FLAG_IS_SET (element, GST_ELEMENT_USE_THREADSAFE_PROPERTIES)) { g_object_set_valist (object, first_property_name, var_args); @@ -617,7 +621,8 @@ gst_element_get_valist (GstElement *element, const gchar *first_property_name, v * the property will be put on the async queue. */ void -gst_element_set_property (GstElement *element, const gchar *property_name, const GValue *value) +gst_element_set_property (GstElement *element, const gchar *property_name, + const GValue *value) { GParamSpec *pspec; GObject *object; @@ -626,8 +631,10 @@ gst_element_set_property (GstElement *element, const gchar *property_name, const g_return_if_fail (property_name != NULL); g_return_if_fail (G_IS_VALUE (value)); - object = (GObject*)element; + object = (GObject*) element; + GST_DEBUG (GST_CAT_PROPERTIES, "setting property %s on element %s", + property_name, gst_element_get_name (element)); if (!GST_FLAG_IS_SET (element, GST_ELEMENT_USE_THREADSAFE_PROPERTIES)) { g_object_set_property (object, property_name, value); return; @@ -635,7 +642,8 @@ gst_element_set_property (GstElement *element, const gchar *property_name, const g_object_ref (object); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (object), property_name); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (object), + property_name); if (!pspec) g_warning ("%s: object class `%s' has no property named `%s'", @@ -1488,18 +1496,19 @@ gst_element_connect_filtered (GstElement *src, GstElement *dest, /* checks */ g_return_val_if_fail (src != NULL, FALSE); - g_return_val_if_fail (GST_IS_ELEMENT(src), FALSE); + g_return_val_if_fail (GST_IS_ELEMENT (src), FALSE); g_return_val_if_fail (dest != NULL, FALSE); - g_return_val_if_fail (GST_IS_ELEMENT(dest), FALSE); + g_return_val_if_fail (GST_IS_ELEMENT (dest), FALSE); GST_DEBUG (GST_CAT_ELEMENT_PADS, "trying to connect element %s to element %s", GST_ELEMENT_NAME (src), GST_ELEMENT_NAME (dest)); - /* loop through the existing pads in the source */ srcpads = gst_element_get_pad_list (src); destpads = gst_element_get_pad_list (dest); if (srcpads || destpads) { + /* loop through the existing pads in the source, trying to find a + * compatible destination pad */ while (srcpads) { srcpad = (GstPad *) GST_PAD_REALIZE (srcpads->data); if ((GST_RPAD_DIRECTION (srcpad) == GST_PAD_SRC) && diff --git a/gst/gstpad.c b/gst/gstpad.c index 232e47ab45..815b5a84db 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1441,14 +1441,15 @@ gst_pad_try_reconnect_filtered_func (GstRealPad *srcpad, GstRealPad *sinkpad, /* optinally clear the caps */ if (clear) { - GST_INFO (GST_CAT_PADS, "reconnect filtered %s:%s and %s:%s, clearing caps", + GST_INFO (GST_CAT_PADS, + "start reconnect filtered %s:%s and %s:%s, clearing caps", GST_DEBUG_PAD_NAME (realsrc), GST_DEBUG_PAD_NAME (realsink)); GST_PAD_CAPS (GST_PAD (realsrc)) = NULL; GST_PAD_CAPS (GST_PAD (realsink)) = NULL; } else { - GST_INFO (GST_CAT_PADS, "reconnect filtered %s:%s and %s:%s", + GST_INFO (GST_CAT_PADS, "start reconnect filtered %s:%s and %s:%s", GST_DEBUG_PAD_NAME (realsrc), GST_DEBUG_PAD_NAME (realsink)); }