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 | 424db0d3aea0ce26a35ba381b4e439f32e50c961 (patch) | |
| tree | cf1e32dcea1deec9b9c8802af89b2cce9ac5b175 /gst/playondemand | |
| parent | 562e0b2526c75e98dfe790dba5fa50a0be0a95d3 (diff) | |
| download | gst-plugins-bad-424db0d3aea0ce26a35ba381b4e439f32e50c961.tar.gz gst-plugins-bad-424db0d3aea0ce26a35ba381b4e439f32e50c961.tar.bz2 gst-plugins-bad-424db0d3aea0ce26a35ba381b4e439f32e50c961.zip | |
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 'gst/playondemand')
| -rw-r--r-- | gst/playondemand/demo-mp3.c | 2 | ||||
| -rw-r--r-- | gst/playondemand/gstplayondemand.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gst/playondemand/demo-mp3.c b/gst/playondemand/demo-mp3.c index 2bb2005c..11fdd6c8 100644 --- a/gst/playondemand/demo-mp3.c +++ b/gst/playondemand/demo-mp3.c @@ -53,7 +53,7 @@ setup_pipeline (gchar *filename) pipeline = gst_pipeline_new("app"); gst_bin_add_many(GST_BIN(pipeline), src, mad, pod, osssink, NULL); - gst_element_connect_many(src, mad, pod, osssink, NULL); + gst_element_link_many(src, mad, pod, osssink, NULL); element_clock = gst_bin_get_clock(GST_BIN(pipeline)); gst_element_set_clock(GST_ELEMENT(pod), element_clock); diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c index d0c8a1f2..7d9959cd 100644 --- a/gst/playondemand/gstplayondemand.c +++ b/gst/playondemand/gstplayondemand.c @@ -141,8 +141,8 @@ play_on_demand_pad_connect (GstPad *pad, GstCaps *caps) const gchar *format; GstPlayOnDemand *filter; - 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); filter = GST_PLAYONDEMAND(GST_PAD_PARENT(pad)); @@ -188,7 +188,7 @@ play_on_demand_pad_connect (GstPad *pad, GstCaps *caps) if (GST_CAPS_IS_FIXED (caps)) return gst_pad_try_set_caps (filter->srcpad, caps); - return GST_PAD_CONNECT_DELAYED; + return GST_PAD_LINK_DELAYED; } GType @@ -282,7 +282,7 @@ play_on_demand_init (GstPlayOnDemand *filter) filter->sinkpad = gst_pad_new_from_template(play_on_demand_sink_factory(), "sink"); gst_pad_set_bufferpool_function(filter->sinkpad, play_on_demand_get_bufferpool); - gst_pad_set_connect_function(filter->sinkpad, play_on_demand_pad_connect); + gst_pad_set_link_function(filter->sinkpad, play_on_demand_pad_connect); gst_element_add_pad(GST_ELEMENT(filter), filter->sinkpad); gst_element_add_pad(GST_ELEMENT(filter), filter->srcpad); |