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

10 files changed, 39 insertions, 39 deletions

diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c
index 045831e4..6ff5eb47 100644
--- a/ext/aalib/gstaasink.c
+++ b/ext/aalib/gstaasink.c
@@ -244,7 +244,7 @@ gst_aasink_sinkconnect (GstPad *pad, GstCaps *caps)
   aasink = GST_AASINK (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", &aasink->width);
   gst_caps_get_int (caps, "height", &aasink->height);
@@ -256,7 +256,7 @@ gst_aasink_sinkconnect (GstPad *pad, GstCaps *caps)
   g_signal_emit( G_OBJECT (aasink), gst_aasink_signals[SIGNAL_HAVE_SIZE], 0,
 		 aasink->width, aasink->height);
 
-  return GST_PAD_CONNECT_OK;
+  return GST_PAD_LINK_OK;
 }
 
 static void
@@ -274,7 +274,7 @@ gst_aasink_init (GstAASink *aasink)
 		  GST_PAD_TEMPLATE_GET (sink_template), "sink");
   gst_element_add_pad (GST_ELEMENT (aasink), aasink->sinkpad);
   gst_pad_set_chain_function (aasink->sinkpad, gst_aasink_chain);
-  gst_pad_set_connect_function (aasink->sinkpad, gst_aasink_sinkconnect);
+  gst_pad_set_link_function (aasink->sinkpad, gst_aasink_sinkconnect);
 
   memcpy(&aasink->ascii_surf, &aa_defparams, sizeof (struct aa_hardware_params));
   aasink->ascii_parms.bright = 0;
diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c
index 7ec81bc0..dc51c2e3 100644
--- a/ext/dv/gstdvdec.c
+++ b/ext/dv/gstdvdec.c
@@ -784,7 +784,7 @@ gst_dvdec_loop (GstElement *element)
 
   dvdec->next_ts += (GST_SECOND*100) / dvdec->framerate;
 
-  if (GST_PAD_IS_CONNECTED (dvdec->audiosrcpad)) {
+  if (GST_PAD_IS_LINKED (dvdec->audiosrcpad)) {
     gint16 *a_ptr;
     gint i, j;
 
@@ -822,7 +822,7 @@ gst_dvdec_loop (GstElement *element)
     gst_dvdec_push (dvdec, outbuf, dvdec->audiosrcpad, ts);
   }
 
-  if (GST_PAD_IS_CONNECTED (dvdec->videosrcpad)) {
+  if (GST_PAD_IS_LINKED (dvdec->videosrcpad)) {
     guint8 *outframe;
     guint8 *outframe_ptrs[3];
     gint outframe_pitches[3];
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index 117de5a1..8c1daae0 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -193,7 +193,7 @@ gst_esdsink_init(GstEsdsink *esdsink)
 		  GST_PAD_TEMPLATE_GET (sink_factory), "sink");
   gst_element_add_pad(GST_ELEMENT(esdsink), esdsink->sinkpad);
   gst_pad_set_chain_function(esdsink->sinkpad, GST_DEBUG_FUNCPTR(gst_esdsink_chain));
-  gst_pad_set_connect_function(esdsink->sinkpad, gst_esdsink_sinkconnect);
+  gst_pad_set_link_function(esdsink->sinkpad, gst_esdsink_sinkconnect);
 
   esdsink->mute = FALSE;
   esdsink->fd = -1;
@@ -226,16 +226,16 @@ gst_esdsink_sinkconnect (GstPad *pad, GstCaps *caps)
   esdsink = GST_ESDSINK (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, "depth", &esdsink->depth);
   gst_caps_get_int (caps, "channels", &esdsink->channels);
   gst_caps_get_int (caps, "rate", &esdsink->frequency);
 
   if (gst_esdsink_sync_parms (esdsink))
-    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/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 3316232c..73b7a08c 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -265,7 +265,7 @@ gst_flacenc_init (FlacEnc *flacenc)
   flacenc->sinkpad = gst_pad_new_from_template (gst_flacenc_sink_template, "sink");
   gst_element_add_pad(GST_ELEMENT(flacenc),flacenc->sinkpad);
   gst_pad_set_chain_function(flacenc->sinkpad,gst_flacenc_chain);
-  gst_pad_set_connect_function (flacenc->sinkpad, gst_flacenc_sinkconnect);
+  gst_pad_set_link_function (flacenc->sinkpad, gst_flacenc_sinkconnect);
 
   flacenc->srcpad = gst_pad_new_from_template (gst_flacenc_src_template, "src");
   gst_element_add_pad(GST_ELEMENT(flacenc),flacenc->srcpad);
@@ -306,7 +306,7 @@ gst_flacenc_sinkconnect (GstPad *pad, GstCaps *caps)
   flacenc = GST_FLACENC (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, "channels", &flacenc->channels);
   gst_caps_get_int (caps, "depth", &flacenc->depth);
@@ -321,7 +321,7 @@ gst_flacenc_sinkconnect (GstPad *pad, GstCaps *caps)
 
   flacenc->negotiated = TRUE;
 
-  return GST_PAD_CONNECT_OK;
+  return GST_PAD_LINK_OK;
 }
 
 static gboolean
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index a5b70f9b..9eef04c8 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -174,7 +174,7 @@ gst_jpegdec_chain (GstPad *pad, GstBuffer *buf)
 
   jpegdec = GST_JPEGDEC (GST_OBJECT_PARENT (pad));
 
-  if (!GST_PAD_IS_CONNECTED (jpegdec->srcpad)) {
+  if (!GST_PAD_IS_LINKED (jpegdec->srcpad)) {
     gst_buffer_unref (buf);
     return;
   }
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/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c
index 912f93fb..101396c0 100644
--- a/ext/libpng/gstpngenc.c
+++ b/ext/libpng/gstpngenc.c
@@ -116,7 +116,7 @@ gst_pngenc_sinkconnect (GstPad * pad, GstCaps * caps)
   pngenc = GST_PNGENC (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", &pngenc->width);
   gst_caps_get_int (caps, "height", &pngenc->height);
@@ -135,7 +135,7 @@ gst_pngenc_init (GstPngEnc * pngenc)
   gst_element_add_pad (GST_ELEMENT (pngenc), pngenc->srcpad);
 
   gst_pad_set_chain_function (pngenc->sinkpad, gst_pngenc_chain);
-  gst_pad_set_connect_function (pngenc->sinkpad, gst_pngenc_sinkconnect);
+  gst_pad_set_link_function (pngenc->sinkpad, gst_pngenc_sinkconnect);
 
   pngenc->png_struct_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, (png_voidp)NULL, user_error_fn, user_warning_fn);
   if ( pngenc->png_struct_ptr == NULL )
diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c
index 47d5105a..45541ad0 100644
--- a/ext/shout2/gstshout2.c
+++ b/ext/shout2/gstshout2.c
@@ -196,7 +196,7 @@ gst_shout2send_init (GstShout2send *shout2send)
   gst_element_add_pad(GST_ELEMENT(shout2send),shout2send->sinkpad);
   gst_pad_set_chain_function(shout2send->sinkpad,gst_shout2send_chain);
 
-  gst_pad_set_connect_function (shout2send->sinkpad, gst_shout2send_connect);
+  gst_pad_set_link_function (shout2send->sinkpad, gst_shout2send_connect);
 
   shout2send->ip = g_strdup ("127.0.0.1");
   shout2send->port = 8000;
@@ -361,16 +361,16 @@ gst_shout2send_connect (GstPad *pad, GstCaps *caps)
   if (!strcmp(gst_caps_get_mime (caps), "audio/x-mp3"))
     {
       audio_format = SHOUT_FORMAT_MP3;
-      return GST_PAD_CONNECT_OK;
+      return GST_PAD_LINK_OK;
     }
 
   if (!strcmp(gst_caps_get_mime (caps), "application/x-ogg"))
     {
       audio_format = SHOUT_FORMAT_VORBIS;
-      return GST_PAD_CONNECT_OK;
+      return GST_PAD_LINK_OK;
     }
   else {
-    return GST_PAD_CONNECT_REFUSED;
+    return GST_PAD_LINK_REFUSED;
   }
 	
 }
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;
 
 }