From: Edward Hervey Date: Mon, 21 Feb 2011 10:55:50 +0000 (+0100) Subject: Revert "element: Call ->release_pad() to clean up pad" X-Git-Tag: RELEASE-0.10.33~342 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b39ccb5ac3e5be1851f1dc10b004610de1520a01;p=platform%2Fupstream%2Fgstreamer.git Revert "element: Call ->release_pad() to clean up pad" This commit changes the request pad behaviour for plugins and applications. Reopens Bug #402562 The proper fix for that bug is to keep track of created request pads. This reverts commit a5e44ffffaa6d7a8d7af8dcb77e37990996253a5. --- diff --git a/gst/gstelement.c b/gst/gstelement.c index a67458a..9323b94 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -335,8 +335,6 @@ gst_element_release_request_pad (GstElement * element, GstPad * pad) g_return_if_fail (GST_IS_ELEMENT (element)); g_return_if_fail (GST_IS_PAD (pad)); - g_return_if_fail (GST_PAD_TEMPLATE_PRESENCE (GST_PAD_PAD_TEMPLATE (pad)) - == GST_PAD_REQUEST); oclass = GST_ELEMENT_GET_CLASS (element); @@ -2960,9 +2958,6 @@ gst_element_dispose (GObject * object) GstElement *element = GST_ELEMENT_CAST (object); GstClock **clock_p; GstBus **bus_p; - GstElementClass *oclass; - - oclass = GST_ELEMENT_GET_CLASS (element); GST_CAT_INFO_OBJECT (GST_CAT_REFCOUNTING, element, "dispose"); @@ -2973,15 +2968,8 @@ gst_element_dispose (GObject * object) "removing %d pads", g_list_length (element->pads)); /* first we break all our links with the outside */ while (element->pads && element->pads->data) { - GstPad *pad = GST_PAD_CAST (element->pads->data); - /* don't call _remove_pad with NULL */ - if (oclass->release_pad && GST_PAD_PAD_TEMPLATE (pad) && - GST_PAD_TEMPLATE_PRESENCE (GST_PAD_PAD_TEMPLATE (pad)) - == GST_PAD_REQUEST) - (oclass->release_pad) (element, GST_PAD_CAST (element->pads->data)); - else - gst_element_remove_pad (element, GST_PAD_CAST (element->pads->data)); + gst_element_remove_pad (element, GST_PAD_CAST (element->pads->data)); } if (G_UNLIKELY (element->pads != NULL)) { g_critical ("could not remove pads from element %s",