From 4516e56791adcf950624bea71487e39fbf619966 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 15 Jan 2004 21:30:49 +0000 Subject: [PATCH] gst/gstelement.c: Use GST_PAD_ macros instead of GST_RPAD_, since we don't know if it's a real or ghost pad. Original commit message from CVS: * gst/gstelement.c: (gst_element_get_compatible_pad_filtered), (gst_element_link_pads_filtered): Use GST_PAD_ macros instead of GST_RPAD_, since we don't know if it's a real or ghost pad. --- ChangeLog | 6 ++++++ gst/gstelement.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7908b9..bdd83ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-01-15 David Schleef + * gst/gstelement.c: (gst_element_get_compatible_pad_filtered), + (gst_element_link_pads_filtered): Use GST_PAD_ macros instead + of GST_RPAD_, since we don't know if it's a real or ghost pad. + +2004-01-15 David Schleef + * gst/gstqueue.c: * gst/gstqueue.h: Fix the spelling of "treshold" and make min_threshold actually diff --git a/gst/gstelement.c b/gst/gstelement.c index 3d059bc..99a6db2 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -1630,7 +1630,7 @@ gst_element_get_compatible_pad_filtered (GstElement *element, GstPad *pad, } templ = gst_pad_template_new ((gchar *) GST_PAD_NAME (pad), - GST_RPAD_DIRECTION (pad), GST_PAD_ALWAYS, templcaps); + GST_PAD_DIRECTION (pad), GST_PAD_ALWAYS, templcaps); foundpad = gst_element_request_compatible_pad (element, templ); gst_object_unref (GST_OBJECT (templ)); @@ -1642,7 +1642,7 @@ gst_element_get_compatible_pad_filtered (GstElement *element, GstPad *pad, //g_warning("got here"); //if (filtercaps == NULL) { templ = gst_pad_template_new ((gchar *) GST_PAD_NAME (pad), - GST_RPAD_DIRECTION (pad), GST_PAD_ALWAYS, gst_caps_new_any()); + GST_PAD_DIRECTION (pad), GST_PAD_ALWAYS, gst_caps_new_any()); foundpad = gst_element_request_compatible_pad (element, templ); gst_object_unref (GST_OBJECT (templ)); @@ -1712,7 +1712,7 @@ gst_element_link_pads_filtered (GstElement *src, const gchar *srcpadname, GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "no pad %s:%s", GST_ELEMENT_NAME (src), srcpadname); return FALSE; } else { - if (!(GST_RPAD_DIRECTION (srcpad) == GST_PAD_SRC)) { + if (!(GST_PAD_DIRECTION (srcpad) == GST_PAD_SRC)) { GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "pad %s:%s is no src pad", GST_DEBUG_PAD_NAME (srcpad)); return FALSE; } @@ -1732,7 +1732,7 @@ gst_element_link_pads_filtered (GstElement *src, const gchar *srcpadname, GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "no pad %s:%s", GST_ELEMENT_NAME (dest), destpadname); return FALSE; } else { - if (!(GST_RPAD_DIRECTION (destpad) == GST_PAD_SINK)) { + if (!(GST_PAD_DIRECTION (destpad) == GST_PAD_SINK)) { GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "pad %s:%s is no sink pad", GST_DEBUG_PAD_NAME (destpad)); return FALSE; } @@ -1758,7 +1758,7 @@ gst_element_link_pads_filtered (GstElement *src, const gchar *srcpadname, do { GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "trying src pad %s:%s", GST_DEBUG_PAD_NAME (srcpad)); - if ((GST_RPAD_DIRECTION (srcpad) == GST_PAD_SRC) && + if ((GST_PAD_DIRECTION (srcpad) == GST_PAD_SRC) && (GST_PAD_PEER (srcpad) == NULL)) { GstPad *temp = gst_element_get_compatible_pad_filtered (dest, srcpad, filtercaps); @@ -1786,7 +1786,7 @@ gst_element_link_pads_filtered (GstElement *src, const gchar *srcpadname, do { GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "trying dest pad %s:%s", GST_DEBUG_PAD_NAME (destpad)); - if ((GST_RPAD_DIRECTION (destpad) == GST_PAD_SINK) && + if ((GST_PAD_DIRECTION (destpad) == GST_PAD_SINK) && (GST_PAD_PEER (destpad) == NULL)) { GstPad *temp = gst_element_get_compatible_pad_filtered (src, destpad, filtercaps); -- 2.7.4