diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-10 10:22:25 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-10 10:22:25 +0000 |
| commit | be876ae57756d21690adfc29cc16c1791643be23 (patch) | |
| tree | 0053f251da40d1b9ac828eda03d9900151fa5b47 /sys/oss | |
| parent | e116d853418a37824413fe6cb21c772fada744d3 (diff) | |
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
Diffstat (limited to 'sys/oss')
| -rw-r--r-- | sys/oss/gstosssink.c | 10 | ||||
| -rw-r--r-- | sys/oss/gstosssrc.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index a37036c0..56b95e9a 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -207,7 +207,7 @@ gst_osssink_init (GstOssSink *osssink) osssink->sinkpad = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (osssink_sink_factory), "sink"); gst_element_add_pad (GST_ELEMENT (osssink), osssink->sinkpad); - gst_pad_set_connect_function (osssink->sinkpad, gst_osssink_sinkconnect); + gst_pad_set_link_function (osssink->sinkpad, gst_osssink_sinkconnect); gst_pad_set_bufferpool_function (osssink->sinkpad, gst_osssink_get_bufferpool); gst_pad_set_convert_function (osssink->sinkpad, gst_osssink_convert); gst_pad_set_query_function (osssink->sinkpad, gst_osssink_sink_query); @@ -236,16 +236,16 @@ gst_osssink_sinkconnect (GstPad *pad, GstCaps *caps) GstOssSink *osssink = GST_OSSSINK (gst_pad_get_parent (pad)); if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; if (!gst_osscommon_parse_caps (&osssink->common, caps)) - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; if (!gst_osscommon_sync_parms (&osssink->common)) { - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; } - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } static inline gint64 diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index 83c32f7b..a1cc8337 100644 --- a/sys/oss/gstosssrc.c +++ b/sys/oss/gstosssrc.c @@ -166,7 +166,7 @@ gst_osssrc_init (GstOssSrc *osssrc) osssrc->srcpad = gst_pad_new_from_template ( GST_PAD_TEMPLATE_GET (osssrc_src_factory), "src"); gst_pad_set_get_function (osssrc->srcpad, gst_osssrc_get); - gst_pad_set_connect_function (osssrc->srcpad, gst_osssrc_srcconnect); + gst_pad_set_link_function (osssrc->srcpad, gst_osssrc_srcconnect); gst_pad_set_convert_function (osssrc->srcpad, gst_osssrc_convert); gst_pad_set_formats_function (osssrc->srcpad, gst_osssrc_get_formats); gst_pad_set_event_function (osssrc->srcpad, gst_osssrc_src_event); @@ -191,15 +191,15 @@ gst_osssrc_srcconnect (GstPad *pad, GstCaps *caps) src = GST_OSSSRC(gst_pad_get_parent (pad)); if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; if (!gst_osscommon_parse_caps (&src->common, caps)) - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; if (!gst_osscommon_sync_parms (&src->common)) - return GST_PAD_CONNECT_REFUSED; + return GST_PAD_LINK_REFUSED; - return GST_PAD_CONNECT_OK; + return GST_PAD_LINK_OK; } static gboolean |