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 --- ext/libfame/gstfamedec.c | 10 +++++----- ext/libfame/gstlibfame.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ext/libfame') diff --git a/ext/libfame/gstfamedec.c b/ext/libfame/gstfamedec.c index accf67ea..d46dfb5e 100644 --- a/ext/libfame/gstfamedec.c +++ b/ext/libfame/gstfamedec.c @@ -306,11 +306,11 @@ gst_famedec_sinkconnect (GstPad *pad, GstCaps *caps) famedec = GST_FAMEENC (gst_pad_get_parent (pad)); if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; if (famedec->initialized) { GST_DEBUG(0, "error: famedec decoder already initialized !"); - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; } gst_caps_get_int (caps, "width", &width); @@ -318,7 +318,7 @@ gst_famedec_sinkconnect (GstPad *pad, GstCaps *caps) /* famedec requires width and height to be multiples of 16 */ if (width % 16 != 0 || height % 16 != 0) - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; famedec->fp.width = width; famedec->fp.height = height; @@ -337,7 +337,7 @@ gst_famedec_sinkconnect (GstPad *pad, GstCaps *caps) famedec->initialized = TRUE; - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } static void @@ -355,7 +355,7 @@ gst_famedec_init (GstFameEnc *famedec) GST_PAD_TEMPLATE_GET (sink_template_factory), "sink"); gst_element_add_pad (GST_ELEMENT (famedec), famedec->sinkpad); gst_pad_set_chain_function (famedec->sinkpad, gst_famedec_chain); - gst_pad_set_connect_function (famedec->sinkpad, gst_famedec_sinkconnect); + gst_pad_set_link_function (famedec->sinkpad, gst_famedec_sinkconnect); famedec->srcpad = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (src_template_factory), "src"); diff --git a/ext/libfame/gstlibfame.c b/ext/libfame/gstlibfame.c index f1786d26..a3a99764 100644 --- a/ext/libfame/gstlibfame.c +++ b/ext/libfame/gstlibfame.c @@ -305,11 +305,11 @@ gst_fameenc_sinkconnect (GstPad *pad, GstCaps *caps) fameenc = GST_FAMEENC (gst_pad_get_parent (pad)); if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; if (fameenc->initialized) { GST_DEBUG(0, "error: fameenc encoder already initialized !"); - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; } gst_caps_get_int (caps, "width", &width); @@ -317,7 +317,7 @@ gst_fameenc_sinkconnect (GstPad *pad, GstCaps *caps) /* fameenc requires width and height to be multiples of 16 */ if (width % 16 != 0 || height % 16 != 0) - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; fameenc->fp.width = width; fameenc->fp.height = height; @@ -337,7 +337,7 @@ gst_fameenc_sinkconnect (GstPad *pad, GstCaps *caps) fameenc->initialized = TRUE; fameenc->time_interval = 0; - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } static void @@ -355,7 +355,7 @@ gst_fameenc_init (GstFameEnc *fameenc) GST_PAD_TEMPLATE_GET (sink_template_factory), "sink"); gst_element_add_pad (GST_ELEMENT (fameenc), fameenc->sinkpad); gst_pad_set_chain_function (fameenc->sinkpad, gst_fameenc_chain); - gst_pad_set_connect_function (fameenc->sinkpad, gst_fameenc_sinkconnect); + gst_pad_set_link_function (fameenc->sinkpad, gst_fameenc_sinkconnect); fameenc->srcpad = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (src_template_factory), "src"); -- cgit v1.2.1