From 3a9c675a6819ecd54c84d1810b7abe055fde3864 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 11 Apr 2002 20:42:25 +0000 Subject: 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. --- ext/jpeg/gstjpeg.c | 20 ++++++++++---------- ext/jpeg/gstjpegdec.h | 6 ++++-- ext/jpeg/gstjpegenc.h | 6 ++++-- 3 files changed, 18 insertions(+), 14 deletions(-) (limited to 'ext/jpeg') diff --git a/ext/jpeg/gstjpeg.c b/ext/jpeg/gstjpeg.c index 653cf9d1..eec4a451 100644 --- a/ext/jpeg/gstjpeg.c +++ b/ext/jpeg/gstjpeg.c @@ -61,7 +61,7 @@ plugin_init (GModule *module, GstPlugin *plugin) GstCaps *raw_caps, *jpeg_caps; /* create an elementfactory for the jpegdec element */ - enc = gst_elementfactory_new("jpegenc",GST_TYPE_JPEGENC, + enc = gst_element_factory_new("jpegenc",GST_TYPE_JPEGENC, &gst_jpegenc_details); g_return_val_if_fail(enc != NULL, FALSE); @@ -69,35 +69,35 @@ plugin_init (GModule *module, GstPlugin *plugin) jpeg_caps = jpeg_caps_factory (); /* register sink pads */ - jpegenc_sink_template = gst_padtemplate_new ("sink", GST_PAD_SINK, + jpegenc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, raw_caps, NULL); - gst_elementfactory_add_padtemplate (enc, jpegenc_sink_template); + gst_element_factory_add_pad_template (enc, jpegenc_sink_template); /* register src pads */ - jpegenc_src_template = gst_padtemplate_new ("src", GST_PAD_SRC, + jpegenc_src_template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, jpeg_caps, NULL); - gst_elementfactory_add_padtemplate (enc, jpegenc_src_template); + gst_element_factory_add_pad_template (enc, jpegenc_src_template); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc)); /* create an elementfactory for the jpegdec element */ - dec = gst_elementfactory_new("jpegdec",GST_TYPE_JPEGDEC, + dec = gst_element_factory_new("jpegdec",GST_TYPE_JPEGDEC, &gst_jpegdec_details); g_return_val_if_fail(dec != NULL, FALSE); /* register sink pads */ - jpegdec_sink_template = gst_padtemplate_new ("sink", GST_PAD_SINK, + jpegdec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, jpeg_caps, NULL); - gst_elementfactory_add_padtemplate (dec, jpegdec_sink_template); + gst_element_factory_add_pad_template (dec, jpegdec_sink_template); /* register src pads */ - jpegdec_src_template = gst_padtemplate_new ("src", GST_PAD_SRC, + jpegdec_src_template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, raw_caps, NULL); - gst_elementfactory_add_padtemplate (dec, jpegdec_src_template); + gst_element_factory_add_pad_template (dec, jpegdec_src_template); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec)); diff --git a/ext/jpeg/gstjpegdec.h b/ext/jpeg/gstjpegdec.h index 8f77a01c..c497f8e5 100644 --- a/ext/jpeg/gstjpegdec.h +++ b/ext/jpeg/gstjpegdec.h @@ -22,9 +22,11 @@ #define __GST_JPEGDEC_H__ -#include #include - +/* this is a hack hack hack to get around jpeglib header bugs... */ +#ifdef HAVE_STDLIB_H +# undef HAVE_STDLIB_H +#endif #include #ifdef __cplusplus diff --git a/ext/jpeg/gstjpegenc.h b/ext/jpeg/gstjpegenc.h index fdd38a22..a31b3145 100644 --- a/ext/jpeg/gstjpegenc.h +++ b/ext/jpeg/gstjpegenc.h @@ -22,9 +22,11 @@ #define __GST_JPEGENC_H__ -#include #include - +/* this is a hack hack hack to get around jpeglib header bugs... */ +#ifdef HAVE_STDLIB_H +# undef HAVE_STDLIB_H +#endif #include #ifdef __cplusplus -- cgit