summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-01-02 07:25:10 +0000
committerDavid Schleef <ds@schleef.org>2004-01-02 07:25:10 +0000
commit7b159d505fea1db624050187f7336bc030d19d44 (patch)
treef8a1932cbfcd983791213f3ef760ffa568303cc3 /gst-libs/gst
parentab8b69675431e3623eac1ecaee91ad80a0786048 (diff)
downloadgst-plugins-bad-7b159d505fea1db624050187f7336bc030d19d44.tar.gz
gst-plugins-bad-7b159d505fea1db624050187f7336bc030d19d44.tar.bz2
gst-plugins-bad-7b159d505fea1db624050187f7336bc030d19d44.zip
Negotiation fixes
Original commit message from CVS: Negotiation fixes
Diffstat (limited to 'gst-libs/gst')
-rw-r--r--gst-libs/gst/audio/gstaudiofilter.c30
1 files changed, 5 insertions, 25 deletions
diff --git a/gst-libs/gst/audio/gstaudiofilter.c b/gst-libs/gst/audio/gstaudiofilter.c
index 46e7c7de..cda21da0 100644
--- a/gst-libs/gst/audio/gstaudiofilter.c
+++ b/gst-libs/gst/audio/gstaudiofilter.c
@@ -105,28 +105,6 @@ static void gst_audiofilter_class_init (gpointer g_class, gpointer class_data)
gobject_class->get_property = gst_audiofilter_get_property;
}
-static GstCaps *
-gst_audiofilter_getcaps (GstPad *pad)
-{
- GstAudiofilter *audiofilter;
- GstCaps *othercaps;
- GstAudiofilterClass *audiofilter_class;
-
- GST_DEBUG("gst_audiofilter_sink_getcaps");
- audiofilter = GST_AUDIOFILTER (gst_pad_get_parent (pad));
-
- audiofilter_class = GST_AUDIOFILTER_CLASS (
- G_OBJECT_GET_CLASS (audiofilter));
-
- if (pad == audiofilter->srcpad) {
- othercaps = gst_pad_get_allowed_caps (audiofilter->sinkpad);
- } else {
- othercaps = gst_pad_get_allowed_caps (audiofilter->srcpad);
- }
-
- return gst_caps_intersect (othercaps, audiofilter_class->caps);
-}
-
static GstPadLinkReturn
gst_audiofilter_link (GstPad *pad, const GstCaps *caps)
{
@@ -148,7 +126,9 @@ gst_audiofilter_link (GstPad *pad, const GstCaps *caps)
link_ret = gst_pad_try_set_caps (audiofilter->srcpad, caps);
}
- if (link_ret != GST_PAD_LINK_OK) return link_ret;
+ if (GST_PAD_LINK_FAILED (link_ret)) {
+ return link_ret;
+ }
structure = gst_caps_get_structure (caps, 0);
@@ -184,7 +164,7 @@ gst_audiofilter_init (GTypeInstance *instance, gpointer g_class)
gst_element_add_pad(GST_ELEMENT(audiofilter),audiofilter->sinkpad);
gst_pad_set_chain_function(audiofilter->sinkpad,gst_audiofilter_chain);
gst_pad_set_link_function(audiofilter->sinkpad,gst_audiofilter_link);
- gst_pad_set_getcaps_function(audiofilter->sinkpad,gst_audiofilter_getcaps);
+ gst_pad_set_getcaps_function(audiofilter->sinkpad,gst_pad_proxy_getcaps);
pad_template = gst_element_class_get_pad_template(GST_ELEMENT_CLASS(g_class),
"src");
@@ -192,7 +172,7 @@ gst_audiofilter_init (GTypeInstance *instance, gpointer g_class)
audiofilter->srcpad = gst_pad_new_from_template(pad_template, "src");
gst_element_add_pad(GST_ELEMENT(audiofilter),audiofilter->srcpad);
gst_pad_set_link_function(audiofilter->srcpad,gst_audiofilter_link);
- gst_pad_set_getcaps_function(audiofilter->srcpad,gst_audiofilter_getcaps);
+ gst_pad_set_getcaps_function(audiofilter->srcpad,gst_pad_proxy_getcaps);
audiofilter->inited = FALSE;
}