From c55962c2d34d7e173da6fb0699cb1d1c101bd8b8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 15 Nov 2011 17:11:46 +0100 Subject: [PATCH] _peer_get_caps() -> peer_query_caps() --- gst/gstpad.c | 4 ++-- gst/gstpad.h | 2 +- libs/gst/base/gstbasesrc.c | 2 +- libs/gst/base/gstbasetransform.c | 2 +- tests/check/elements/selector.c | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gst/gstpad.c b/gst/gstpad.c index 9ca5fd2b8b..bc9be5e45d 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -2157,7 +2157,7 @@ gst_pad_query_caps (GstPad * pad, GstCaps * filter) /** - * gst_pad_peer_get_caps: + * gst_pad_peer_query_caps: * @pad: a #GstPad to get the capabilities of. * @filter: a #GstCaps filter. * @@ -2174,7 +2174,7 @@ gst_pad_query_caps (GstPad * pad, GstCaps * filter) * returns %NULL when there is no peer pad. */ GstCaps * -gst_pad_peer_get_caps (GstPad * pad, GstCaps * filter) +gst_pad_peer_query_caps (GstPad * pad, GstCaps * filter) { GstCaps *result = NULL; GstQuery *query; diff --git a/gst/gstpad.h b/gst/gstpad.h index 56988ef83c..781f9c41bc 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -838,7 +838,7 @@ GstCaps * gst_pad_query_caps (GstPad * pad, GstCaps *filter); gboolean gst_pad_accept_caps (GstPad * pad, GstCaps *caps); gboolean gst_pad_set_caps (GstPad * pad, GstCaps *caps); -GstCaps * gst_pad_peer_get_caps (GstPad * pad, GstCaps *filter); +GstCaps * gst_pad_peer_query_caps (GstPad * pad, GstCaps *filter); gboolean gst_pad_peer_accept_caps (GstPad * pad, GstCaps *caps); /* capsnego for linked pads */ diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c index b1e64fb761..e8801e7e49 100644 --- a/libs/gst/base/gstbasesrc.c +++ b/libs/gst/base/gstbasesrc.c @@ -2760,7 +2760,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc) goto no_caps; /* get the peer caps */ - peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc), thiscaps); + peercaps = gst_pad_peer_query_caps (GST_BASE_SRC_PAD (basesrc), thiscaps); GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps); if (peercaps) { /* The result is already a subset of our caps */ diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index 5bec2ba9be..ea9477808e 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -673,7 +673,7 @@ gst_base_transform_query_caps (GstBaseTransform * trans, GstPad * pad, peerfilter = temp; } - peercaps = gst_pad_peer_get_caps (otherpad, peerfilter); + peercaps = gst_pad_peer_query_caps (otherpad, peerfilter); if (peerfilter) gst_caps_unref (peerfilter); diff --git a/tests/check/elements/selector.c b/tests/check/elements/selector.c index 582eb1cfc1..85ad92fb14 100644 --- a/tests/check/elements/selector.c +++ b/tests/check/elements/selector.c @@ -474,7 +474,7 @@ GST_START_TEST (test_output_selector_getcaps_none); g_object_set (sel, "active-pad", pad, NULL); - caps = gst_pad_peer_get_caps (input_pad, NULL); + caps = gst_pad_peer_query_caps (input_pad, NULL); /* in 'none' mode, the getcaps returns the template, which is ANY */ g_assert (gst_caps_is_any (caps)); @@ -514,7 +514,7 @@ GST_START_TEST (test_output_selector_getcaps_all); g_object_set (sel, "active-pad", pad, NULL); - caps = gst_pad_peer_get_caps (input_pad, NULL); + caps = gst_pad_peer_query_caps (input_pad, NULL); g_assert (gst_caps_is_equal (caps, expected)); gst_caps_unref (caps); @@ -556,7 +556,7 @@ GST_START_TEST (test_output_selector_getcaps_active); templ = gst_pad_get_pad_template ((GstPad *) walker->data); expected = gst_pad_template_get_caps (templ); - caps = gst_pad_peer_get_caps (input_pad, NULL); + caps = gst_pad_peer_query_caps (input_pad, NULL); g_assert (gst_caps_is_equal (caps, expected)); gst_caps_unref (caps);