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/chart/gstchart.c | 4 ++-- gst/deinterlace/gstdeinterlace.c | 4 ++-- gst/filter/gstbpwsinc.c | 4 ++-- gst/filter/gstiir.c | 4 ++-- gst/filter/gstlpwsinc.c | 4 ++-- gst/mixmatrix/mixmatrix.c | 14 +++++++------- gst/passthrough/gstpassthrough.c | 12 ++++++------ gst/playondemand/demo-mp3.c | 2 +- gst/playondemand/gstplayondemand.c | 8 ++++---- gst/qtdemux/qtdemux.c | 2 +- gst/smooth/gstsmooth.c | 6 +++--- gst/smpte/gstsmpte.c | 6 +++--- gst/speed/demo-mp3.c | 2 +- gst/speed/gstspeed.c | 12 ++++++------ gst/videocrop/gstvideocrop.c | 6 +++--- gst/virtualdub/gstxsharpen.c | 4 ++-- gst/y4m/gsty4mencode.c | 6 +++--- 17 files changed, 50 insertions(+), 50 deletions(-) (limited to 'gst') diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c index 39fe7ad1..bbe57e86 100644 --- a/gst/chart/gstchart.c +++ b/gst/chart/gstchart.c @@ -213,7 +213,7 @@ gst_chart_init (GstChart *chart) gst_element_add_pad (GST_ELEMENT (chart), chart->srcpad); gst_pad_set_chain_function (chart->sinkpad, gst_chart_chain); - gst_pad_set_connect_function (chart->sinkpad, gst_chart_sinkconnect); + gst_pad_set_link_function (chart->sinkpad, gst_chart_sinkconnect); chart->next_time = 0; chart->peerpool = NULL; @@ -244,7 +244,7 @@ gst_chart_sinkconnect (GstPad *pad, GstCaps *caps) chart->samplerate); /*gst_chart_sync_parms (chart); */ /* */ - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } static void diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c index 9b76d7ee..6ed84123 100644 --- a/gst/deinterlace/gstdeinterlace.c +++ b/gst/deinterlace/gstdeinterlace.c @@ -146,7 +146,7 @@ gst_deinterlace_sinkconnect (GstPad *pad, GstCaps *caps) filter = GST_DEINTERLACE(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, "width", &filter->width); gst_caps_get_int (caps, "height", &filter->height); @@ -165,7 +165,7 @@ gst_deinterlace_init (GstDeInterlace *filter) { filter->sinkpad = gst_pad_new_from_template(deinterlace_sink_factory (),"sink"); gst_pad_set_chain_function(filter->sinkpad,gst_deinterlace_chain); - gst_pad_set_connect_function(filter->sinkpad,gst_deinterlace_sinkconnect); + gst_pad_set_link_function(filter->sinkpad,gst_deinterlace_sinkconnect); gst_element_add_pad(GST_ELEMENT(filter),filter->sinkpad); filter->srcpad = gst_pad_new_from_template(deinterlace_src_factory (),"src"); diff --git a/gst/filter/gstbpwsinc.c b/gst/filter/gstbpwsinc.c index 511d59e5..89c95f93 100644 --- a/gst/filter/gstbpwsinc.c +++ b/gst/filter/gstbpwsinc.c @@ -162,7 +162,7 @@ gst_bpwsinc_init (GstBPWSinc * filter) { filter->sinkpad = gst_pad_new_from_template (gst_filter_sink_factory (), "sink"); gst_pad_set_chain_function (filter->sinkpad, gst_bpwsinc_chain); - gst_pad_set_connect_function (filter->sinkpad, gst_bpwsinc_sink_connect); + gst_pad_set_link_function (filter->sinkpad, gst_bpwsinc_sink_connect); gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad); filter->srcpad = gst_pad_new_from_template (gst_filter_src_factory (), "src"); @@ -189,7 +189,7 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps) g_assert (caps != NULL); if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; set_retval = gst_pad_try_set_caps (filter->srcpad, caps); diff --git a/gst/filter/gstiir.c b/gst/filter/gstiir.c index 0176a3ba..7f447f77 100644 --- a/gst/filter/gstiir.c +++ b/gst/filter/gstiir.c @@ -148,7 +148,7 @@ gst_iir_init (GstIIR * filter) { filter->sinkpad = gst_pad_new_from_template (gst_filter_sink_factory (), "sink"); gst_pad_set_chain_function (filter->sinkpad, gst_iir_chain); - gst_pad_set_connect_function (filter->sinkpad, gst_iir_sink_connect); + gst_pad_set_link_function (filter->sinkpad, gst_iir_sink_connect); gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad); filter->srcpad = gst_pad_new_from_template (gst_filter_src_factory (), "src"); @@ -170,7 +170,7 @@ gst_iir_sink_connect (GstPad * pad, GstCaps * caps) filter = GST_IIR (gst_pad_get_parent (pad)); if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; set_retval = gst_pad_try_set_caps(filter->srcpad, caps); if (set_retval > 0) { diff --git a/gst/filter/gstlpwsinc.c b/gst/filter/gstlpwsinc.c index 1d5e6e3b..6be8e1ad 100644 --- a/gst/filter/gstlpwsinc.c +++ b/gst/filter/gstlpwsinc.c @@ -154,7 +154,7 @@ gst_lpwsinc_init (GstLPWSinc * filter) { filter->sinkpad = gst_pad_new_from_template (gst_filter_sink_factory (), "sink"); gst_pad_set_chain_function (filter->sinkpad, gst_lpwsinc_chain); - gst_pad_set_connect_function (filter->sinkpad, gst_lpwsinc_sink_connect); + gst_pad_set_link_function (filter->sinkpad, gst_lpwsinc_sink_connect); gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad); filter->srcpad = gst_pad_new_from_template (gst_filter_src_factory (), "src"); @@ -178,7 +178,7 @@ gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps) g_assert (caps != NULL); if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; set_retval = gst_pad_try_set_caps(filter->srcpad, caps); diff --git a/gst/mixmatrix/mixmatrix.c b/gst/mixmatrix/mixmatrix.c index 12e6c1d6..cc644860 100644 --- a/gst/mixmatrix/mixmatrix.c +++ b/gst/mixmatrix/mixmatrix.c @@ -307,20 +307,20 @@ gst_mixmatrix_connect (GstPad *pad, GstCaps *caps) gint i; if (!GST_CAPS_IS_FIXED(caps) || GST_PAD_IS_SRC (pad)) { - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; } for (i=0;isrcpadalloc;i++) { if (mix->srcpads[i]) { if (GST_PAD_CAPS(mix->srcpads[i]) == NULL) if (gst_pad_try_set_caps(mix->srcpads[i], caps) <= 0) - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; } } mix->caps = caps; - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } static GstPad * @@ -348,8 +348,8 @@ gst_mixmatrix_request_new_pad (GstElement *element, GstPadTemplate *templ, const pad = gst_pad_new_from_template(sinktempl, name); GST_PAD_ELEMENT_PRIVATE(pad) = GINT_TO_POINTER(padnum); gst_element_add_pad(GST_ELEMENT(mix), pad); -// g_signal_connect(G_OBJECT(pad), "disconnect", G_CALLBACK(sink_disconnected), mix); - gst_pad_set_connect_function (pad, gst_mixmatrix_connect); +// g_signal_connect(G_OBJECT(pad), "unlink", G_CALLBACK(sink_unlinked), mix); + gst_pad_set_link_function (pad, gst_mixmatrix_connect); // create a bytestream for it mix->sinkbs[padnum] = gst_bytestream_new(pad); @@ -371,8 +371,8 @@ gst_mixmatrix_request_new_pad (GstElement *element, GstPadTemplate *templ, const pad = gst_pad_new_from_template(srctempl, name); GST_PAD_ELEMENT_PRIVATE(pad) = GINT_TO_POINTER(padnum); gst_element_add_pad(GST_ELEMENT(mix), pad); -// g_signal_connect(G_OBJECT(pad), "disconnect", G_CALLBACK(sink_disconnected), mix); - //gst_pad_set_connect_function (pad, gst_mixmatrix_connect); +// g_signal_connect(G_OBJECT(pad), "unlink", G_CALLBACK(sink_unlinked), mix); + //gst_pad_set_link_function (pad, gst_mixmatrix_connect); // store away the pad and account for it mix->srcpads[padnum] = pad; 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); diff --git a/gst/playondemand/demo-mp3.c b/gst/playondemand/demo-mp3.c index 2bb2005c..11fdd6c8 100644 --- a/gst/playondemand/demo-mp3.c +++ b/gst/playondemand/demo-mp3.c @@ -53,7 +53,7 @@ setup_pipeline (gchar *filename) pipeline = gst_pipeline_new("app"); gst_bin_add_many(GST_BIN(pipeline), src, mad, pod, osssink, NULL); - gst_element_connect_many(src, mad, pod, osssink, NULL); + gst_element_link_many(src, mad, pod, osssink, NULL); element_clock = gst_bin_get_clock(GST_BIN(pipeline)); gst_element_set_clock(GST_ELEMENT(pod), element_clock); diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c index d0c8a1f2..7d9959cd 100644 --- a/gst/playondemand/gstplayondemand.c +++ b/gst/playondemand/gstplayondemand.c @@ -141,8 +141,8 @@ play_on_demand_pad_connect (GstPad *pad, GstCaps *caps) const gchar *format; GstPlayOnDemand *filter; - g_return_val_if_fail(caps != NULL, GST_PAD_CONNECT_DELAYED); - g_return_val_if_fail(pad != NULL, GST_PAD_CONNECT_DELAYED); + g_return_val_if_fail(caps != NULL, GST_PAD_LINK_DELAYED); + g_return_val_if_fail(pad != NULL, GST_PAD_LINK_DELAYED); filter = GST_PLAYONDEMAND(GST_PAD_PARENT(pad)); @@ -188,7 +188,7 @@ play_on_demand_pad_connect (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 @@ -282,7 +282,7 @@ play_on_demand_init (GstPlayOnDemand *filter) filter->sinkpad = gst_pad_new_from_template(play_on_demand_sink_factory(), "sink"); gst_pad_set_bufferpool_function(filter->sinkpad, play_on_demand_get_bufferpool); - gst_pad_set_connect_function(filter->sinkpad, play_on_demand_pad_connect); + gst_pad_set_link_function(filter->sinkpad, play_on_demand_pad_connect); gst_element_add_pad(GST_ELEMENT(filter), filter->sinkpad); gst_element_add_pad(GST_ELEMENT(filter), filter->srcpad); diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 4d6e155c..f6769893 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -687,7 +687,7 @@ gst_qtp_traverse(gpointer poffs,gpointer value,gpointer data) if (qtdemux->bs_pos < sample->offset) { gst_qtp_skip(qtdemux,sample->offset - qtdemux->bs_pos); - if (sample->track->pad && GST_PAD_IS_CONNECTED(sample->track->pad)) { + if (sample->track->pad && GST_PAD_IS_LINKED(sample->track->pad)) { GstBuffer * buf; buf = gst_qtp_read(qtdemux,sample->size); GST_BUFFER_TIMESTAMP(buf) = sample->timestamp; diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c index 6b3f1a43..0a130024 100644 --- a/gst/smooth/gstsmooth.c +++ b/gst/smooth/gstsmooth.c @@ -136,12 +136,12 @@ gst_smooth_sinkconnect (GstPad *pad, GstCaps *caps) filter = GST_SMOOTH (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, "width", &filter->width); gst_caps_get_int (caps, "height", &filter->height); - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } static void @@ -149,7 +149,7 @@ gst_smooth_init (GstSmooth *smooth) { smooth->sinkpad = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (smooth_sink_factory), "sink"); - gst_pad_set_connect_function (smooth->sinkpad, gst_smooth_sinkconnect); + gst_pad_set_link_function (smooth->sinkpad, gst_smooth_sinkconnect); gst_pad_set_chain_function (smooth->sinkpad, gst_smooth_chain); gst_element_add_pad (GST_ELEMENT (smooth), smooth->sinkpad); diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c index a123010f..c28f16a6 100644 --- a/gst/smpte/gstsmpte.c +++ b/gst/smpte/gstsmpte.c @@ -228,7 +228,7 @@ gst_smpte_sinkconnect (GstPad *pad, GstCaps *caps) smpte = GST_SMPTE (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, "width", &smpte->width); gst_caps_get_int (caps, "height", &smpte->height); @@ -244,12 +244,12 @@ gst_smpte_init (GstSMPTE *smpte) { smpte->sinkpad1 = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (smpte_sink1_factory), "sink1"); - gst_pad_set_connect_function (smpte->sinkpad1, gst_smpte_sinkconnect); + gst_pad_set_link_function (smpte->sinkpad1, gst_smpte_sinkconnect); gst_element_add_pad (GST_ELEMENT (smpte), smpte->sinkpad1); smpte->sinkpad2 = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (smpte_sink2_factory), "sink2"); - gst_pad_set_connect_function (smpte->sinkpad2, gst_smpte_sinkconnect); + gst_pad_set_link_function (smpte->sinkpad2, gst_smpte_sinkconnect); gst_element_add_pad (GST_ELEMENT (smpte), smpte->sinkpad2); smpte->srcpad = gst_pad_new_from_template ( 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); diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c index 0f051795..2ee1fce9 100644 --- a/gst/videocrop/gstvideocrop.c +++ b/gst/videocrop/gstvideocrop.c @@ -181,7 +181,7 @@ gst_video_crop_init (GstVideoCrop *video_crop) GST_PAD_TEMPLATE_GET (video_crop_sink_template_factory), "sink"); gst_element_add_pad (GST_ELEMENT (video_crop), video_crop->sinkpad); gst_pad_set_chain_function (video_crop->sinkpad, GST_DEBUG_FUNCPTR (gst_video_crop_chain)); - gst_pad_set_connect_function (video_crop->sinkpad, GST_DEBUG_FUNCPTR (gst_video_crop_sink_connect)); + gst_pad_set_link_function (video_crop->sinkpad, GST_DEBUG_FUNCPTR (gst_video_crop_sink_connect)); video_crop->srcpad = gst_pad_new_from_template( GST_PAD_TEMPLATE_GET (video_crop_src_template_factory), "src"); @@ -260,7 +260,7 @@ gst_video_crop_sink_connect (GstPad *pad, GstCaps *caps) /* we are not going to act on variable caps */ if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; video_crop = GST_VIDEO_CROP (gst_pad_get_parent (pad)); @@ -272,7 +272,7 @@ gst_video_crop_sink_connect (GstPad *pad, GstCaps *caps) if (video_crop->crop_height + video_crop->crop_y > video_crop->height) video_crop->crop_height = video_crop->height - video_crop->crop_y; - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } static void diff --git a/gst/virtualdub/gstxsharpen.c b/gst/virtualdub/gstxsharpen.c index c93a9b7b..f7368973 100644 --- a/gst/virtualdub/gstxsharpen.c +++ b/gst/virtualdub/gstxsharpen.c @@ -139,7 +139,7 @@ gst_xsharpen_sinkconnect (GstPad * pad, GstCaps * caps) sharpen = GST_XSHARPEN (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, "width", &sharpen->width); gst_caps_get_int (caps, "height", &sharpen->height); @@ -156,7 +156,7 @@ gst_xsharpen_init (GstXsharpen * sharpen) { sharpen->sinkpad = gst_pad_new_from_template (gst_virtualdub_sink_factory (), "sink"); gst_pad_set_chain_function (sharpen->sinkpad, gst_xsharpen_chain); - gst_pad_set_connect_function (sharpen->sinkpad, gst_xsharpen_sinkconnect); + gst_pad_set_link_function (sharpen->sinkpad, gst_xsharpen_sinkconnect); gst_element_add_pad (GST_ELEMENT (sharpen), sharpen->sinkpad); sharpen->srcpad = gst_pad_new_from_template (gst_virtualdub_src_factory (), "src"); diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c index 1f101fd6..6a24b18c 100644 --- a/gst/y4m/gsty4mencode.c +++ b/gst/y4m/gsty4mencode.c @@ -124,12 +124,12 @@ gst_lavencode_sinkconnect (GstPad *pad, GstCaps *caps) filter = GST_LAVENCODE (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, "width", &filter->width); gst_caps_get_int (caps, "height", &filter->height); - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } static void @@ -139,7 +139,7 @@ gst_lavencode_init (GstLavEncode *filter) GST_PAD_TEMPLATE_GET (lavencode_sink_factory), "sink"); gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad); gst_pad_set_chain_function (filter->sinkpad, gst_lavencode_chain); - gst_pad_set_connect_function (filter->sinkpad, gst_lavencode_sinkconnect); + gst_pad_set_link_function (filter->sinkpad, gst_lavencode_sinkconnect); filter->srcpad = gst_pad_new_from_template( GST_PAD_TEMPLATE_GET (lavencode_src_factory), "src"); -- cgit v1.2.1