From e9f6be3a04d61283e284c027b3f8184e9f7b4236 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Fri, 2 Jan 2004 07:25:10 +0000 Subject: [PATCH] Negotiation fixes Original commit message from CVS: Negotiation fixes --- ChangeLog | 10 ++++++++++ gst/debug/efence.c | 19 ++----------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa195725e2..b796638fb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-01-01 David Schleef + + Negotiation fixes: + * gst-libs/gst/audio/gstaudiofilter.c: (gst_audiofilter_link), + (gst_audiofilter_init): + * gst/debug/efence.c: (gst_efence_init): + * gst/deinterlace/gstdeinterlace.c: (gst_deinterlace_link), + (gst_deinterlace_init): + * gst/volume/gstvolume.c: (volume_connect): + 2004-01-01 David Schleef Convert elements to use gst_pad_use_explicit_caps() where diff --git a/gst/debug/efence.c b/gst/debug/efence.c index d46218f8dd..56b8ba76b4 100644 --- a/gst/debug/efence.c +++ b/gst/debug/efence.c @@ -101,21 +101,6 @@ void *gst_fenced_buffer_alloc(GstBuffer *buffer, unsigned int length, GstBuffer *gst_fenced_buffer_new(void); -static GstPadLinkReturn -gst_efence_link (GstPad *pad, const GstCaps *caps) -{ - GstEFence *filter; - GstPad *otherpad; - - filter = GST_EFENCE (gst_pad_get_parent (pad)); - g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED); - g_return_val_if_fail (GST_IS_EFENCE (filter), - GST_PAD_LINK_REFUSED); - otherpad = (pad == filter->srcpad ? filter->sinkpad : filter->srcpad); - - return gst_pad_try_set_caps (otherpad, caps); -} - GType gst_gst_efence_get_type (void) { @@ -184,10 +169,10 @@ gst_efence_init (GstEFence *filter) { filter->sinkpad = gst_pad_new_from_template ( gst_static_pad_template_get(&gst_efence_sink_factory), "sink"); - gst_pad_set_link_function (filter->sinkpad, gst_efence_link); + gst_pad_set_link_function (filter->sinkpad, gst_pad_proxy_pad_link); filter->srcpad = gst_pad_new_from_template ( gst_static_pad_template_get(&gst_efence_src_factory), "src"); - gst_pad_set_link_function (filter->srcpad, gst_efence_link); + gst_pad_set_link_function (filter->srcpad, gst_pad_proxy_pad_link); gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad); gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);