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 /ext/jack | |
| 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 'ext/jack')
| -rw-r--r-- | ext/jack/gstjack.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c index 4a19f3fc..25c57eb5 100644 --- a/ext/jack/gstjack.c +++ b/ext/jack/gstjack.c @@ -281,7 +281,7 @@ gst_jack_request_new_pad (GstElement *element, GstPadTemplate *templ, const gcha pad->peer_name = newname; pad->pad = gst_pad_new_from_template (templ, newname); gst_element_add_pad (GST_ELEMENT (this), pad->pad); - gst_pad_set_connect_function (pad->pad, gst_jack_connect); + gst_pad_set_link_function (pad->pad, gst_jack_connect); this->pads = g_list_append (this->pads, pad); @@ -402,18 +402,18 @@ gst_jack_connect (GstPad *pad, GstCaps *caps) gint rate; this = GST_JACK (gst_pad_get_parent (pad)); - g_return_val_if_fail (this != NULL, GST_PAD_CONNECT_REFUSED); - g_return_val_if_fail (GST_IS_JACK (this), GST_PAD_CONNECT_REFUSED); + g_return_val_if_fail (this != NULL, GST_PAD_LINK_REFUSED); + g_return_val_if_fail (GST_IS_JACK (this), GST_PAD_LINK_REFUSED); if (GST_CAPS_IS_FIXED (caps)) { gst_caps_get_int (caps, "rate", &rate); if (this->bin && rate != this->bin->rate) - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; } static void |