From 0d546490f6a29081441d2ac630ccb6274414b081 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 24 May 2011 18:39:41 +0200 Subject: [PATCH] remove some more deprecated methods --- gst/gst_private.h | 4 ---- gst/gstelement.c | 36 ------------------------------------ 2 files changed, 40 deletions(-) diff --git a/gst/gst_private.h b/gst/gst_private.h index beb36e6..acc437d 100644 --- a/gst/gst_private.h +++ b/gst/gst_private.h @@ -242,10 +242,6 @@ extern GstDebugCategory *_priv_GST_CAT_POLL; #endif -#ifdef GST_DISABLE_DEPRECATED -typedef GList* (*GstPadIntLinkFunction) (GstPad *pad); -#endif - G_END_DECLS #endif /* __GST_PRIVATE_H__ */ diff --git a/gst/gstelement.c b/gst/gstelement.c index b6a1adb..44ed8d7 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -1152,42 +1152,6 @@ gst_element_request_pad (GstElement * element, return _gst_element_request_pad (element, templ, name, caps); } -/** - * gst_element_get_pad: - * @element: a #GstElement. - * @name: the name of the pad to retrieve. - * - * Retrieves a pad from @element by name. Tries gst_element_get_static_pad() - * first, then gst_element_get_request_pad(). - * - * Deprecated: This function is deprecated as it's unclear if the reference - * to the result pad should be released with gst_object_unref() in case of a static pad - * or gst_element_release_request_pad() in case of a request pad. - * Use gst_element_get_static_pad() or gst_element_get_request_pad() instead. - * - * Returns: (transfer full): the #GstPad if found, otherwise %NULL. Unref or Release after usage, - * depending on the type of the pad. - */ -#ifndef GST_REMOVE_DEPRECATED -#ifdef GST_DISABLE_DEPRECATED -GstPad *gst_element_get_pad (GstElement * element, const gchar * name); -#endif -GstPad * -gst_element_get_pad (GstElement * element, const gchar * name) -{ - GstPad *pad; - - g_return_val_if_fail (GST_IS_ELEMENT (element), NULL); - g_return_val_if_fail (name != NULL, NULL); - - pad = gst_element_get_static_pad (element, name); - if (!pad) - pad = gst_element_get_request_pad (element, name); - - return pad; -} -#endif /* GST_REMOVE_DEPRECATED */ - static GstIterator * gst_element_iterate_pad_list (GstElement * element, GList ** padlist) { -- 2.7.4