summaryrefslogtreecommitdiffstats
path: root/gst/passthrough
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-01-10 10:22:25 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-01-10 10:22:25 +0000
commit424db0d3aea0ce26a35ba381b4e439f32e50c961 (patch)
treecf1e32dcea1deec9b9c8802af89b2cce9ac5b175 /gst/passthrough
parent562e0b2526c75e98dfe790dba5fa50a0be0a95d3 (diff)
downloadgst-plugins-bad-424db0d3aea0ce26a35ba381b4e439f32e50c961.tar.gz
gst-plugins-bad-424db0d3aea0ce26a35ba381b4e439f32e50c961.tar.bz2
gst-plugins-bad-424db0d3aea0ce26a35ba381b4e439f32e50c961.zip
another batch of connect->link fixes please let me know about issues and please refrain of making them yourself, so t...
Original commit message from CVS: another batch of connect->link fixes please let me know about issues and please refrain of making them yourself, so that I don't spend double the time resolving conflicts
Diffstat (limited to 'gst/passthrough')
-rw-r--r--gst/passthrough/gstpassthrough.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gst/passthrough/gstpassthrough.c b/gst/passthrough/gstpassthrough.c
index 46045f73..f92790e0 100644
--- a/gst/passthrough/gstpassthrough.c
+++ b/gst/passthrough/gstpassthrough.c
@@ -115,12 +115,12 @@ passthrough_connect_sink (GstPad *pad, GstCaps *caps)
const gchar *format;
GstPassthrough *filter;
- g_return_val_if_fail (pad != NULL, GST_PAD_CONNECT_DELAYED);
- g_return_val_if_fail (caps != NULL, GST_PAD_CONNECT_DELAYED);
+ g_return_val_if_fail (pad != NULL, GST_PAD_LINK_DELAYED);
+ g_return_val_if_fail (caps != NULL, GST_PAD_LINK_DELAYED);
filter = GST_PASSTHROUGH (gst_pad_get_parent (pad));
- g_return_val_if_fail (filter != NULL, GST_PAD_CONNECT_REFUSED);
- g_return_val_if_fail (GST_IS_PASSTHROUGH (filter), GST_PAD_CONNECT_REFUSED);
+ g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED);
+ g_return_val_if_fail (GST_IS_PASSTHROUGH (filter), GST_PAD_LINK_REFUSED);
gst_caps_get_string(caps, "format", &format);
@@ -157,7 +157,7 @@ passthrough_connect_sink (GstPad *pad, GstCaps *caps)
if (GST_CAPS_IS_FIXED (caps))
return gst_pad_try_set_caps (filter->srcpad, caps);
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
GType
@@ -208,7 +208,7 @@ passthrough_init (GstPassthrough *filter)
filter->sinkpad = gst_pad_new_from_template (passthrough_sink_factory (),"sink");
gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
- gst_pad_set_connect_function (filter->sinkpad, passthrough_connect_sink);
+ gst_pad_set_link_function (filter->sinkpad, passthrough_connect_sink);
gst_pad_set_bufferpool_function (filter->sinkpad, passthrough_get_bufferpool);
gst_pad_set_chain_function (filter->sinkpad, passthrough_chain);