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

1 files changed, 9 insertions, 9 deletions

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);