mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-05 15:08:48 +00:00
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.
This commit is contained in:
parent
61c61cefda
commit
4516e56791
2 changed files with 12 additions and 6 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2004-01-15 David Schleef <ds@schleef.org>
|
||||||
|
|
||||||
|
* 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 <ds@schleef.org>
|
2004-01-15 David Schleef <ds@schleef.org>
|
||||||
|
|
||||||
* gst/gstqueue.c:
|
* gst/gstqueue.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),
|
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);
|
foundpad = gst_element_request_compatible_pad (element, templ);
|
||||||
gst_object_unref (GST_OBJECT (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");
|
//g_warning("got here");
|
||||||
//if (filtercaps == NULL) {
|
//if (filtercaps == NULL) {
|
||||||
templ = gst_pad_template_new ((gchar *) GST_PAD_NAME (pad),
|
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);
|
foundpad = gst_element_request_compatible_pad (element, templ);
|
||||||
gst_object_unref (GST_OBJECT (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);
|
GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "no pad %s:%s", GST_ELEMENT_NAME (src), srcpadname);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
} else {
|
} 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));
|
GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "pad %s:%s is no src pad", GST_DEBUG_PAD_NAME (srcpad));
|
||||||
return FALSE;
|
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);
|
GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "no pad %s:%s", GST_ELEMENT_NAME (dest), destpadname);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
} else {
|
} 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));
|
GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "pad %s:%s is no sink pad", GST_DEBUG_PAD_NAME (destpad));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -1758,7 +1758,7 @@ gst_element_link_pads_filtered (GstElement *src, const gchar *srcpadname,
|
||||||
do {
|
do {
|
||||||
GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "trying src pad %s:%s",
|
GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "trying src pad %s:%s",
|
||||||
GST_DEBUG_PAD_NAME (srcpad));
|
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)) {
|
(GST_PAD_PEER (srcpad) == NULL)) {
|
||||||
GstPad *temp = gst_element_get_compatible_pad_filtered (dest, srcpad,
|
GstPad *temp = gst_element_get_compatible_pad_filtered (dest, srcpad,
|
||||||
filtercaps);
|
filtercaps);
|
||||||
|
@ -1786,7 +1786,7 @@ gst_element_link_pads_filtered (GstElement *src, const gchar *srcpadname,
|
||||||
do {
|
do {
|
||||||
GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "trying dest pad %s:%s",
|
GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "trying dest pad %s:%s",
|
||||||
GST_DEBUG_PAD_NAME (destpad));
|
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)) {
|
(GST_PAD_PEER (destpad) == NULL)) {
|
||||||
GstPad *temp = gst_element_get_compatible_pad_filtered (src, destpad,
|
GstPad *temp = gst_element_get_compatible_pad_filtered (src, destpad,
|
||||||
filtercaps);
|
filtercaps);
|
||||||
|
|
Loading…
Reference in a new issue