diff options
| author | Andy Wingo <wingo@pobox.com> | 2002-04-11 20:42:26 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2002-04-11 20:42:26 +0000 |
| commit | 06d94641c271dc846e335104ac61beab38445c4a (patch) | |
| tree | cd066b7966e619ab2c31e6fdf43d584be29c0e90 /ext/hermes | |
| parent | 8c43b5fd9b38cf9c55e5c148c985cd1b8731b5b7 (diff) | |
| download | gst-plugins-bad-06d94641c271dc846e335104ac61beab38445c4a.tar.gz gst-plugins-bad-06d94641c271dc846e335104ac61beab38445c4a.tar.bz2 gst-plugins-bad-06d94641c271dc846e335104ac61beab38445c4a.zip | |
GstPadTemplate <-> gst_pad_template <-> GST_PAD_TEMPLATE same with *factory and typefind.
Original commit message from CVS:
GstPadTemplate <-> gst_pad_template <-> GST_PAD_TEMPLATE
same with *factory and typefind.
also, some -Werror fixes.
Diffstat (limited to 'ext/hermes')
| -rw-r--r-- | ext/hermes/gstcolorspace.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c index fcd76148..5e081a79 100644 --- a/ext/hermes/gstcolorspace.c +++ b/ext/hermes/gstcolorspace.c @@ -45,7 +45,7 @@ enum { ARG_DEST, }; -GST_PADTEMPLATE_FACTORY (colorspace_src_template_factory, +GST_PAD_TEMPLATE_FACTORY (colorspace_src_template_factory, "src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -62,7 +62,7 @@ GST_PADTEMPLATE_FACTORY (colorspace_src_template_factory, ) ) -GST_PADTEMPLATE_FACTORY (colorspace_sink_template_factory, +GST_PAD_TEMPLATE_FACTORY (colorspace_sink_template_factory, "sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -250,7 +250,7 @@ gst_colorspace_getcaps (GstPad *pad, GstCaps *caps) /* we can do everything our peer can... */ peercaps = gst_caps_copy (gst_pad_get_allowed_caps (space->srcpad)); /* and our own template of course */ - ourcaps = gst_caps_copy (gst_pad_get_padtemplate_caps (pad)); + ourcaps = gst_caps_copy (gst_pad_get_pad_template_caps (pad)); /* merge them together, we prefer the peercaps first */ result = gst_caps_prepend (ourcaps, peercaps); @@ -397,7 +397,7 @@ static void gst_colorspace_init (GstColorspace *space) { space->sinkpad = gst_pad_new_from_template ( - GST_PADTEMPLATE_GET (colorspace_sink_template_factory), "sink"); + GST_PAD_TEMPLATE_GET (colorspace_sink_template_factory), "sink"); gst_pad_set_connect_function (space->sinkpad, gst_colorspace_sinkconnect); gst_pad_set_getcaps_function (space->sinkpad, gst_colorspace_getcaps); gst_pad_set_bufferpool_function (space->sinkpad, colorspace_get_bufferpool); @@ -405,7 +405,7 @@ gst_colorspace_init (GstColorspace *space) gst_element_add_pad(GST_ELEMENT(space),space->sinkpad); space->srcpad = gst_pad_new_from_template ( - GST_PADTEMPLATE_GET (colorspace_src_template_factory), "src"); + GST_PAD_TEMPLATE_GET (colorspace_src_template_factory), "src"); gst_element_add_pad(GST_ELEMENT(space),space->srcpad); gst_pad_set_connect_function (space->srcpad, gst_colorspace_srcconnect); @@ -558,14 +558,14 @@ plugin_init (GModule *module, GstPlugin *plugin) g_return_val_if_fail (hermes_res != 0, FALSE); #endif - factory = gst_elementfactory_new ("colorspace", GST_TYPE_COLORSPACE, + factory = gst_element_factory_new ("colorspace", GST_TYPE_COLORSPACE, &colorspace_details); g_return_val_if_fail (factory != NULL, FALSE); - gst_elementfactory_add_padtemplate (factory, - GST_PADTEMPLATE_GET (colorspace_src_template_factory)); - gst_elementfactory_add_padtemplate (factory, - GST_PADTEMPLATE_GET (colorspace_sink_template_factory)); + gst_element_factory_add_pad_template (factory, + GST_PAD_TEMPLATE_GET (colorspace_src_template_factory)); + gst_element_factory_add_pad_template (factory, + GST_PAD_TEMPLATE_GET (colorspace_sink_template_factory)); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); |