summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/gsm/gstgsmdec.c8
-rw-r--r--ext/gsm/gstgsmenc.c8
-rw-r--r--ext/hermes/gstcolorspace.c18
-rw-r--r--ext/jack/gstjack.c12
-rw-r--r--ext/ladspa/gstladspa.c24
-rw-r--r--ext/lcs/gstcolorspace.c18
-rw-r--r--ext/libfame/gstfamedec.c10
-rw-r--r--ext/libfame/gstlibfame.c10
-rw-r--r--ext/mplex/gstmplex.cc6
-rw-r--r--ext/sdl/sdlvideosink.c10
-rw-r--r--ext/snapshot/gstsnapshot.c6
-rw-r--r--ext/swfdec/gstswfdec.c16
-rw-r--r--ext/tarkin/gsttarkinenc.c8
13 files changed, 77 insertions, 77 deletions
diff --git a/ext/gsm/gstgsmdec.c b/ext/gsm/gstgsmdec.c
index d43ad722..30a183c3 100644
--- a/ext/gsm/gstgsmdec.c
+++ b/ext/gsm/gstgsmdec.c
@@ -94,7 +94,7 @@ gst_gsmdec_init (GstGSMDec *gsmdec)
gsmdec->sinkpad = gst_pad_new_from_template (gsmdec_sink_template, "sink");
gst_element_add_pad (GST_ELEMENT (gsmdec), gsmdec->sinkpad);
gst_pad_set_chain_function (gsmdec->sinkpad, gst_gsmdec_chain);
- gst_pad_set_connect_function (gsmdec->sinkpad, gst_gsmdec_sinkconnect);
+ gst_pad_set_link_function (gsmdec->sinkpad, gst_gsmdec_sinkconnect);
gsmdec->srcpad = gst_pad_new_from_template (gsmdec_src_template, "src");
gst_element_add_pad (GST_ELEMENT (gsmdec), gsmdec->srcpad);
@@ -112,7 +112,7 @@ gst_gsmdec_sinkconnect (GstPad *pad, GstCaps *caps)
gsmdec = GST_GSMDEC (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);
@@ -130,9 +130,9 @@ gst_gsmdec_sinkconnect (GstPad *pad, GstCaps *caps)
"channels", GST_PROPS_INT (1)
)) > 0)
{
- 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/gsm/gstgsmenc.c b/ext/gsm/gstgsmenc.c
index a425f383..d3ece7e8 100644
--- a/ext/gsm/gstgsmenc.c
+++ b/ext/gsm/gstgsmenc.c
@@ -103,7 +103,7 @@ gst_gsmenc_init (GstGSMEnc *gsmenc)
gsmenc->sinkpad = gst_pad_new_from_template (gsmenc_sink_template, "sink");
gst_element_add_pad (GST_ELEMENT (gsmenc), gsmenc->sinkpad);
gst_pad_set_chain_function (gsmenc->sinkpad, gst_gsmenc_chain);
- gst_pad_set_connect_function (gsmenc->sinkpad, gst_gsmenc_sinkconnect);
+ gst_pad_set_link_function (gsmenc->sinkpad, gst_gsmenc_sinkconnect);
gsmenc->srcpad = gst_pad_new_from_template (gsmenc_src_template, "src");
gst_element_add_pad (GST_ELEMENT (gsmenc), gsmenc->srcpad);
@@ -122,7 +122,7 @@ gst_gsmenc_sinkconnect (GstPad *pad, GstCaps *caps)
gsmenc = GST_GSMENC (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", &gsmenc->rate);
if (gst_pad_try_set_caps (gsmenc->srcpad, GST_CAPS_NEW (
@@ -131,9 +131,9 @@ gst_gsmenc_sinkconnect (GstPad *pad, GstCaps *caps)
"rate", GST_PROPS_INT (gsmenc->rate)
)) > 0)
{
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c
index ba076d08..933571a5 100644
--- a/ext/hermes/gstcolorspace.c
+++ b/ext/hermes/gstcolorspace.c
@@ -295,7 +295,7 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps)
space = GST_COLORSPACE (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", &space->width);
@@ -309,11 +309,11 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps)
if (peer) {
if (gst_colorspace_srcconnect_func (pad, gst_pad_get_allowed_caps (space->srcpad), FALSE) < 1) {
space->sinkcaps = NULL;
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
}
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
static GstPadConnectReturn
@@ -337,7 +337,7 @@ gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps)
if (newcaps)
gst_pad_recalc_allowed_caps (space->sinkpad);
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
/* first see if we can do the format natively by filtering the peer caps
@@ -348,7 +348,7 @@ gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps)
if (gst_pad_try_set_caps (space->srcpad, peercaps) > 0) {
space->type = GST_COLORSPACE_NONE;
space->disabled = FALSE;
- return GST_PAD_CONNECT_DONE;
+ return GST_PAD_LINK_DONE;
}
}
/* then see what the peer has that matches the size */
@@ -369,7 +369,7 @@ gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps)
if (colorspace_setup_converter (space, ourcaps, peercaps)) {
if (gst_pad_try_set_caps (space->srcpad, peercaps) > 0) {
space->disabled = FALSE;
- return GST_PAD_CONNECT_DONE;
+ return GST_PAD_LINK_DONE;
}
}
peercaps = peercaps->next;
@@ -378,7 +378,7 @@ gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps)
/* we disable ourself here */
space->disabled = TRUE;
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
GType
@@ -425,7 +425,7 @@ gst_colorspace_init (GstColorspace *space)
{
space->sinkpad = gst_pad_new_from_template (
GST_PAD_TEMPLATE_GET (colorspace_sink_template_factory), "sink");
- gst_pad_set_connect_function (space->sinkpad, gst_colorspace_sinkconnect);
+ gst_pad_set_link_function (space->sinkpad, gst_colorspace_sinkconnect);
gst_pad_set_getcaps_function (space->sinkpad, gst_colorspace_getcaps);
gst_pad_set_bufferpool_function (space->sinkpad, colorspace_get_bufferpool);
gst_pad_set_chain_function(space->sinkpad,gst_colorspace_chain);
@@ -434,7 +434,7 @@ gst_colorspace_init (GstColorspace *space)
space->srcpad = gst_pad_new_from_template (
GST_PAD_TEMPLATE_GET (colorspace_src_template_factory), "src");
gst_element_add_pad(GST_ELEMENT(space),space->srcpad);
- gst_pad_set_connect_function (space->srcpad, gst_colorspace_srcconnect);
+ gst_pad_set_link_function (space->srcpad, gst_colorspace_srcconnect);
#ifdef HAVE_HERMES
space->h_handle = Hermes_ConverterInstance (0);
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
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c
index b904a853..02b4609c 100644
--- a/ext/ladspa/gstladspa.c
+++ b/ext/ladspa/gstladspa.c
@@ -447,13 +447,13 @@ gst_ladspa_init (GstLADSPA *ladspa)
ladspa->newcaps = TRUE;
- gst_pad_set_connect_function (ladspa->srcpads[0], gst_ladspa_connect_get);
+ gst_pad_set_link_function (ladspa->srcpads[0], gst_ladspa_connect_get);
gst_pad_set_get_function (ladspa->srcpads[0], gst_ladspa_get);
} else if (sinkcount==1){
/* with one sink we can use the chain function */
GST_DEBUG (0, "chain mode");
- gst_pad_set_connect_function (ladspa->sinkpads[0], gst_ladspa_connect);
+ gst_pad_set_link_function (ladspa->sinkpads[0], gst_ladspa_connect);
gst_pad_set_chain_function (ladspa->sinkpads[0], gst_ladspa_chain);
gst_pad_set_bufferpool_function (ladspa->sinkpads[0], gst_ladspa_get_bufferpool);
} else if (sinkcount > 1){
@@ -461,7 +461,7 @@ gst_ladspa_init (GstLADSPA *ladspa)
GST_DEBUG (0, "loop mode with %d sink pads and %d src pads", sinkcount, srccount);
for (i=0;i<sinkcount;i++) {
- gst_pad_set_connect_function (ladspa->sinkpads[i], gst_ladspa_connect);
+ gst_pad_set_link_function (ladspa->sinkpads[i], gst_ladspa_connect);
gst_pad_set_bufferpool_function (ladspa->sinkpads[i], gst_ladspa_get_bufferpool);
}
gst_element_set_loop_function (GST_ELEMENT (ladspa), gst_ladspa_loop);
@@ -490,8 +490,8 @@ gst_ladspa_connect (GstPad *pad, GstCaps *caps)
guint i;
gint rate;
- 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);
if (gst_caps_get_int (caps, "rate", &rate)){
/* have to instantiate ladspa plugin when samplerate changes (groan) */
@@ -499,7 +499,7 @@ gst_ladspa_connect (GstPad *pad, GstCaps *caps)
ladspa->samplerate = rate;
if (! gst_ladspa_instantiate(ladspa))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
}
@@ -509,11 +509,11 @@ gst_ladspa_connect (GstPad *pad, GstCaps *caps)
if (GST_CAPS_IS_FIXED (caps)) {
for (i=0;i<oclass->numsrcpads;i++) {
if (gst_pad_try_set_caps (ladspa->srcpads[i], caps) <= 0)
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
}
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
static GstPadConnectReturn
@@ -522,18 +522,18 @@ gst_ladspa_connect_get (GstPad *pad, GstCaps *caps)
GstLADSPA *ladspa = (GstLADSPA*)GST_OBJECT_PARENT (pad);
gint rate;
- 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);
if (gst_caps_get_int (caps, "rate", &rate)){
if (ladspa->samplerate != rate) {
ladspa->samplerate = rate;
if (! gst_ladspa_instantiate(ladspa))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
}
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
static void
diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c
index 8f8785dc..43591fcb 100644
--- a/ext/lcs/gstcolorspace.c
+++ b/ext/lcs/gstcolorspace.c
@@ -252,7 +252,7 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps)
space = GST_COLORSPACE (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", &space->width);
@@ -266,11 +266,11 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps)
if (peer) {
if (gst_colorspace_srcconnect_func (pad, gst_pad_get_allowed_caps (space->srcpad), FALSE) < 1) {
space->sinkcaps = NULL;
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
}
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
static GstPadConnectReturn
@@ -294,7 +294,7 @@ gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps)
if (newcaps)
gst_pad_recalc_allowed_caps (space->sinkpad);
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
/* first see if we can do the format natively by filtering the peer caps
@@ -305,7 +305,7 @@ gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps)
if (gst_pad_try_set_caps (space->srcpad, peercaps) > 0) {
space->type = GST_COLORSPACE_NONE;
space->disabled = FALSE;
- return GST_PAD_CONNECT_DONE;
+ return GST_PAD_LINK_DONE;
}
}
/* then see what the peer has that matches the size */
@@ -326,7 +326,7 @@ gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps)
if (colorspace_setup_converter (space, ourcaps, peercaps)) {
if (gst_pad_try_set_caps (space->srcpad, peercaps) > 0) {
space->disabled = FALSE;
- return GST_PAD_CONNECT_DONE;
+ return GST_PAD_LINK_DONE;
}
}
peercaps = peercaps->next;
@@ -336,7 +336,7 @@ gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps)
/* we disable ourself here */
space->disabled = TRUE;
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
static GType
@@ -383,7 +383,7 @@ gst_colorspace_init (GstColorspace *space)
{
space->sinkpad = gst_pad_new_from_template (
GST_PAD_TEMPLATE_GET (colorspace_sink_template_factory), "sink");
- gst_pad_set_connect_function (space->sinkpad, gst_colorspace_sinkconnect);
+ gst_pad_set_link_function (space->sinkpad, gst_colorspace_sinkconnect);
gst_pad_set_getcaps_function (space->sinkpad, gst_colorspace_getcaps);
gst_pad_set_bufferpool_function (space->sinkpad, colorspace_get_bufferpool);
gst_pad_set_chain_function(space->sinkpad,gst_colorspace_chain);
@@ -392,7 +392,7 @@ gst_colorspace_init (GstColorspace *space)
space->srcpad = gst_pad_new_from_template (
GST_PAD_TEMPLATE_GET (colorspace_src_template_factory), "src");
gst_element_add_pad(GST_ELEMENT(space),space->srcpad);
- gst_pad_set_connect_function (space->srcpad, gst_colorspace_srcconnect);
+ gst_pad_set_link_function (space->srcpad, gst_colorspace_srcconnect);
space->pool = NULL;
space->disabled = TRUE;
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");
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc
index 43a0901d..0d8db34c 100644
--- a/ext/mplex/gstmplex.cc
+++ b/ext/mplex/gstmplex.cc
@@ -256,12 +256,12 @@ gst_mplex_video_connect (GstPad *pad, GstCaps *caps)
mplex = GST_MPLEX (gst_pad_get_parent (pad));
if (!GST_CAPS_IS_FIXED (caps))
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
stream = (GstMPlexStream *) gst_pad_get_element_private (pad);
if (!gst_caps_get_int (caps, "mpegversion", &version)){
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
if (version == 2) {
@@ -271,7 +271,7 @@ gst_mplex_video_connect (GstPad *pad, GstCaps *caps)
stream->type = GST_MPLEX_STREAM_VIDEO;
}
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c
index 5c7fdee4..86c63660 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -175,7 +175,7 @@ gst_sdlvideosink_init (GstSDLVideoSink *sdlvideosink)
gst_element_add_pad (GST_ELEMENT (sdlvideosink), sdlvideosink->sinkpad);
gst_pad_set_chain_function (sdlvideosink->sinkpad, gst_sdlvideosink_chain);
- gst_pad_set_connect_function (sdlvideosink->sinkpad, gst_sdlvideosink_sinkconnect);
+ gst_pad_set_link_function (sdlvideosink->sinkpad, gst_sdlvideosink_sinkconnect);
sdlvideosink->window_width = -1;
sdlvideosink->window_height = -1;
@@ -367,7 +367,7 @@ gst_sdlvideosink_sinkconnect (GstPad *pad,
/* we are not going to act on variable caps */
if (!GST_CAPS_IS_FIXED (vscapslist))
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
for (caps = vscapslist; caps != NULL; caps = vscapslist = vscapslist->next)
{
@@ -390,14 +390,14 @@ gst_sdlvideosink_sinkconnect (GstPad *pad,
/* try it out */
if (!gst_sdlvideosink_create(sdlvideosink, TRUE))
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
}
/* if we got here - it's not good */
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
diff --git a/ext/snapshot/gstsnapshot.c b/ext/snapshot/gstsnapshot.c
index 712e04f5..2a33f1f0 100644
--- a/ext/snapshot/gstsnapshot.c
+++ b/ext/snapshot/gstsnapshot.c
@@ -173,7 +173,7 @@ gst_snapshot_sinkconnect (GstPad *pad, GstCaps *caps)
filter = GST_SNAPSHOT (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);
@@ -223,14 +223,14 @@ gst_snapshot_sinkconnect (GstPad *pad, GstCaps *caps)
gst_pad_try_set_caps (filter->srcpad, caps);
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
}
static void
gst_snapshot_init (GstSnapshot *snapshot)
{
snapshot->sinkpad = gst_pad_new_from_template (GST_PAD_TEMPLATE_GET (snapshot_sink_factory), "sink");
- gst_pad_set_connect_function (snapshot->sinkpad, gst_snapshot_sinkconnect);
+ gst_pad_set_link_function (snapshot->sinkpad, gst_snapshot_sinkconnect);
gst_pad_set_chain_function (snapshot->sinkpad, gst_snapshot_chain);
gst_element_add_pad (GST_ELEMENT (snapshot), snapshot->sinkpad);
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index 497717f9..8ec93e4d 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -388,13 +388,13 @@ gst_swfdec_vo_destroy (GstSwfdec *swfdec)
static GstPadConnectReturn
gst_swfdec_connect(GstPad *pad, GstCaps *caps)
{
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
}
#endif
#if 0
static void
-src_disconnected(GstPad *srcpad, GstPad *sinkpad, GstSwfdec *plugin)
+src_unlinked(GstPad *srcpad, GstPad *sinkpad, GstSwfdec *plugin)
{
GST_DEBUG(GST_CAT_PADS, "removing pad %s:%s",
GST_DEBUG_PAD_NAME(srcpad));
@@ -433,9 +433,9 @@ gst_swfdec_request_new_pad (GstElement *element, GstPadTemplate *templ,
srcpad = gst_pad_new_from_template(templ, "audio_00");
gst_element_add_pad(GST_ELEMENT(plugin), srcpad);
- g_signal_connect(G_OBJECT(srcpad), "disconnected",
- G_CALLBACK(src_disconnected), plugin);
- gst_pad_set_connect_function(srcpad, gst_swfdec_connect);
+ g_signal_connect(G_OBJECT(srcpad), "unlinked",
+ G_CALLBACK(src_unlinked), plugin);
+ gst_pad_set_link_function(srcpad, gst_swfdec_connect);
plugin->audiopad = srcpad;
}else if(strcmp("video", template) == 0){
#endif
@@ -445,9 +445,9 @@ gst_swfdec_request_new_pad (GstElement *element, GstPadTemplate *templ,
srcpad = gst_pad_new_from_template(templ, "video_00");
gst_element_add_pad(GST_ELEMENT(plugin), srcpad);
- g_signal_connect(G_OBJECT(srcpad), "disconnected",
- G_CALLBACK(src_disconnected), plugin);
- gst_pad_set_connect_function(srcpad, gst_swfdec_connect);
+ g_signal_connect(G_OBJECT(srcpad), "unlinked",
+ G_CALLBACK(src_unlinked), plugin);
+ gst_pad_set_link_function(srcpad, gst_swfdec_connect);
plugin->videopad = srcpad;
}else{
g_warning("swfdec: request new pad with bad template\n");
diff --git a/ext/tarkin/gsttarkinenc.c b/ext/tarkin/gsttarkinenc.c
index a506822c..30d7394b 100644
--- a/ext/tarkin/gsttarkinenc.c
+++ b/ext/tarkin/gsttarkinenc.c
@@ -124,7 +124,7 @@ gst_tarkinenc_sinkconnect (GstPad *pad, GstCaps *caps)
tarkinenc = GST_TARKINENC (gst_pad_get_parent (pad));
if (!GST_CAPS_IS_FIXED (caps))
- return GST_PAD_CONNECT_DELAYED;
+ return GST_PAD_LINK_DELAYED;
gst_caps_debug (caps, "caps to be set on tarkin sink pad");
@@ -139,9 +139,9 @@ gst_tarkinenc_sinkconnect (GstPad *pad, GstCaps *caps)
gst_tarkinenc_setup (tarkinenc);
if (tarkinenc->setup)
- return GST_PAD_CONNECT_OK;
+ return GST_PAD_LINK_OK;
- return GST_PAD_CONNECT_REFUSED;
+ return GST_PAD_LINK_REFUSED;
}
static void
@@ -150,7 +150,7 @@ gst_tarkinenc_init (TarkinEnc * tarkinenc)
tarkinenc->sinkpad = gst_pad_new_from_template (enc_sink_template, "sink");
gst_element_add_pad (GST_ELEMENT (tarkinenc), tarkinenc->sinkpad);
gst_pad_set_chain_function (tarkinenc->sinkpad, gst_tarkinenc_chain);
- gst_pad_set_connect_function (tarkinenc->sinkpad, gst_tarkinenc_sinkconnect);
+ gst_pad_set_link_function (tarkinenc->sinkpad, gst_tarkinenc_sinkconnect);
tarkinenc->srcpad = gst_pad_new_from_template (enc_src_template, "src");
gst_element_add_pad (GST_ELEMENT (tarkinenc), tarkinenc->srcpad);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 07:15:17 +0000