diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-10 10:22:25 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-10 10:22:25 +0000 |
| commit | 424db0d3aea0ce26a35ba381b4e439f32e50c961 (patch) | |
| tree | cf1e32dcea1deec9b9c8802af89b2cce9ac5b175 /gst/speed/gstspeed.c | |
| parent | 562e0b2526c75e98dfe790dba5fa50a0be0a95d3 (diff) | |
| download | gst-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/speed/gstspeed.c')
| -rw-r--r-- | gst/speed/gstspeed.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); |