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 | be876ae57756d21690adfc29cc16c1791643be23 (patch) | |
| tree | 0053f251da40d1b9ac828eda03d9900151fa5b47 /ext/speex | |
| parent | e116d853418a37824413fe6cb21c772fada744d3 (diff) | |
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/speex')
| -rw-r--r-- | ext/speex/gstspeexdec.c | 8 | ||||
| -rw-r--r-- | ext/speex/gstspeexenc.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c index c696e896..062c68e2 100644 --- a/ext/speex/gstspeexdec.c +++ b/ext/speex/gstspeexdec.c @@ -93,7 +93,7 @@ gst_speexdec_init (GstSpeexDec *speexdec) speexdec->sinkpad = gst_pad_new_from_template (speexdec_sink_template, "sink"); gst_element_add_pad (GST_ELEMENT (speexdec), speexdec->sinkpad); gst_pad_set_chain_function (speexdec->sinkpad, gst_speexdec_chain); - gst_pad_set_connect_function (speexdec->sinkpad, gst_speexdec_sinkconnect); + gst_pad_set_link_function (speexdec->sinkpad, gst_speexdec_sinkconnect); speexdec->srcpad = gst_pad_new_from_template (speexdec_src_template, "src"); gst_element_add_pad (GST_ELEMENT (speexdec), speexdec->srcpad); @@ -109,7 +109,7 @@ gst_speexdec_sinkconnect (GstPad *pad, GstCaps *caps) speexdec = GST_SPEEXDEC (gst_pad_get_parent (pad)); if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; gst_caps_get_int (caps, "rate", &rate); @@ -127,9 +127,9 @@ gst_speexdec_sinkconnect (GstPad *pad, GstCaps *caps) "channels", GST_PROPS_INT (1) ))) { - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; } static void diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index 20bce443..a3f33e19 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -102,7 +102,7 @@ gst_speexenc_init (GstSpeexEnc *speexenc) speexenc->sinkpad = gst_pad_new_from_template (speexenc_sink_template, "sink"); gst_element_add_pad (GST_ELEMENT (speexenc), speexenc->sinkpad); gst_pad_set_chain_function (speexenc->sinkpad, gst_speexenc_chain); - gst_pad_set_connect_function (speexenc->sinkpad, gst_speexenc_sinkconnect); + gst_pad_set_link_function (speexenc->sinkpad, gst_speexenc_sinkconnect); speexenc->srcpad = gst_pad_new_from_template (speexenc_src_template, "src"); gst_element_add_pad (GST_ELEMENT (speexenc), speexenc->srcpad); @@ -122,7 +122,7 @@ gst_speexenc_sinkconnect (GstPad *pad, GstCaps *caps) speexenc = GST_SPEEXENC (gst_pad_get_parent (pad)); if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; gst_caps_get_int (caps, "rate", &speexenc->rate); if (gst_pad_try_set_caps (speexenc->srcpad, GST_CAPS_NEW ( @@ -137,9 +137,9 @@ gst_speexenc_sinkconnect (GstPad *pad, GstCaps *caps) speexenc->state = speex_encoder_init(speexenc->mode); speex_encoder_ctl(speexenc->state, SPEEX_GET_FRAME_SIZE, &speexenc->frame_size); - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; } |