diff options
author | David Schleef <ds@schleef.org> | 2003-12-22 01:47:09 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2003-12-22 01:47:09 +0000 |
commit | ce51f6173ca1c37d90f8e2e316d90316583d7755 (patch) | |
tree | 270b121765a11455f5bf8166b526d7ac336dc56c /gst/effectv/gstwarp.c | |
parent | f43f0a9fd781bafab689e46bd936af9cb5ed2690 (diff) |
Merge CAPS branch
Original commit message from CVS:
Merge CAPS branch
Diffstat (limited to 'gst/effectv/gstwarp.c')
-rw-r--r-- | gst/effectv/gstwarp.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c index 9ea36624..03648536 100644 --- a/gst/effectv/gstwarp.c +++ b/gst/effectv/gstwarp.c @@ -136,8 +136,10 @@ gst_warptv_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_add_pad_template (element_class, gst_effectv_src_factory ()); - gst_element_class_add_pad_template (element_class, gst_effectv_sink_factory ()); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_effectv_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_effectv_sink_template)); gst_element_class_set_details (element_class, &gst_warptv_details); } @@ -158,32 +160,33 @@ gst_warptv_class_init (GstWarpTVClass * klass) } static GstPadLinkReturn -gst_warptv_sinkconnect (GstPad * pad, GstCaps * caps) +gst_warptv_sinkconnect (GstPad * pad, const GstCaps * caps) { GstWarpTV *filter; + GstStructure *structure; filter = GST_WARPTV (gst_pad_get_parent (pad)); + structure = gst_caps_get_structure (caps, 0); - if (!GST_CAPS_IS_FIXED (caps)) - return GST_PAD_LINK_DELAYED; - - gst_caps_get_int (caps, "width", &filter->width); - gst_caps_get_int (caps, "height", &filter->height); + gst_structure_get_int (structure, "width", &filter->width); + gst_structure_get_int (structure, "height", &filter->height); gst_warptv_initialize (filter); - return gst_pad_try_set_caps (filter->srcpad, gst_caps_ref (caps)); + return gst_pad_try_set_caps (filter->srcpad, caps); } static void gst_warptv_init (GstWarpTV * filter) { - filter->sinkpad = gst_pad_new_from_template (gst_effectv_sink_factory (), "sink"); + filter->sinkpad = gst_pad_new_from_template ( + gst_static_pad_template_get (&gst_effectv_sink_template), "sink"); gst_pad_set_chain_function (filter->sinkpad, gst_warptv_chain); gst_pad_set_link_function (filter->sinkpad, gst_warptv_sinkconnect); gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad); - filter->srcpad = gst_pad_new_from_template (gst_effectv_src_factory (), "src"); + filter->srcpad = gst_pad_new_from_template ( + gst_static_pad_template_get (&gst_effectv_src_template), "src"); gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad); filter->tval = 0; |