From 424db0d3aea0ce26a35ba381b4e439f32e50c961 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Fri, 10 Jan 2003 10:22:25 +0000 Subject: 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 --- gst/speed/demo-mp3.c | 2 +- gst/speed/gstspeed.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'gst/speed') diff --git a/gst/speed/demo-mp3.c b/gst/speed/demo-mp3.c index d3eb3b13..6f10f9de 100644 --- a/gst/speed/demo-mp3.c +++ b/gst/speed/demo-mp3.c @@ -49,7 +49,7 @@ int main(int argc, char **argv) pipeline = gst_pipeline_new("app"); gst_bin_add_many (GST_BIN(pipeline), filesrc, mad, stereo2mono, speed, osssink, NULL); - gst_element_connect_many (filesrc, mad, stereo2mono, speed, osssink, NULL); + gst_element_link_many (filesrc, mad, stereo2mono, speed, osssink, NULL); g_object_set(G_OBJECT(filesrc), "location", argv[1], NULL); gst_element_set_state(pipeline, GST_STATE_PLAYING); diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c index b43a5afe..d883b6e4 100644 --- a/gst/speed/gstspeed.c +++ b/gst/speed/gstspeed.c @@ -118,18 +118,18 @@ speed_connect (GstPad *pad, GstCaps *caps) GstPad *otherpad; filter = GST_SPEED (gst_pad_get_parent (pad)); - g_return_val_if_fail (filter != NULL, GST_PAD_CONNECT_REFUSED); - g_return_val_if_fail (GST_IS_SPEED (filter), GST_PAD_CONNECT_REFUSED); + g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED); + g_return_val_if_fail (GST_IS_SPEED (filter), GST_PAD_LINK_REFUSED); otherpad = (pad == filter->srcpad ? filter->sinkpad : filter->srcpad); if (GST_CAPS_IS_FIXED (caps)) { if (!speed_parse_caps (filter, caps)) - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; return gst_pad_try_set_caps(otherpad, caps); } - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; } static gboolean @@ -225,10 +225,10 @@ static void speed_init (GstSpeed *filter) { filter->sinkpad = gst_pad_new_from_template(speed_sink_factory (),"sink"); - gst_pad_set_connect_function(filter->sinkpad,speed_connect); + gst_pad_set_link_function(filter->sinkpad,speed_connect); gst_pad_set_bufferpool_function (filter->sinkpad, speed_sink_get_bufferpool); filter->srcpad = gst_pad_new_from_template(speed_src_factory (),"src"); - gst_pad_set_connect_function(filter->srcpad,speed_connect); + gst_pad_set_link_function(filter->srcpad,speed_connect); gst_element_add_pad(GST_ELEMENT(filter),filter->sinkpad); gst_element_add_pad(GST_ELEMENT(filter),filter->srcpad); -- cgit v1.2.1