mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

Avoid symbol conflicts

Browse source 
Original commit message from CVS:
Avoid symbol conflicts
This commit is contained in:
Wim Taymans 2002-07-28 19:51:29 +00:00
parent b89f95f179
commit b44ed86c31
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/vorbis/vorbis.c
View file

@ -29,8 +29,8 @@ extern GstElementDetails vorbisdec_details;
static GstCaps* vorbis_type_find (GstBuffer *buf, gpointer private);
GstPadTemplate *dec_src_template, *dec_sink_template;
GstPadTemplate *enc_src_template, *enc_sink_template;
GstPadTemplate *gst_vorbisdec_src_template, *gst_vorbisdec_sink_template;
GstPadTemplate *gst_vorbisenc_src_template, *gst_vorbisenc_sink_template;
static GstCaps*
vorbis_caps_factory (void)
@ -114,16 +114,16 @@ plugin_init (GModule *module, GstPlugin *plugin)
vorbis_caps = vorbis_caps_factory ();
/* register sink pads */
enc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK,
gst_vorbisenc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK,
GST_PAD_ALWAYS,
raw_caps, NULL);
gst_element_factory_add_pad_template (enc, enc_sink_template);
gst_element_factory_add_pad_template (enc, gst_vorbisenc_sink_template);
/* register src pads */
enc_src_template = gst_pad_template_new ("src", GST_PAD_SRC,
gst_vorbisenc_src_template = gst_pad_template_new ("src", GST_PAD_SRC,
GST_PAD_ALWAYS,
vorbis_caps, NULL);
gst_element_factory_add_pad_template (enc, enc_src_template);
gst_element_factory_add_pad_template (enc, gst_vorbisenc_src_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc));
@ -133,17 +133,17 @@ plugin_init (GModule *module, GstPlugin *plugin)
g_return_val_if_fail(dec != NULL, FALSE);
/* register sink pads */
dec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK,
gst_vorbisdec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK,
GST_PAD_ALWAYS,
vorbis_caps, NULL);
gst_element_factory_add_pad_template (dec, dec_sink_template);
gst_element_factory_add_pad_template (dec, gst_vorbisdec_sink_template);
raw_caps = gst_caps_prepend (raw_caps, raw_caps2);
/* register src pads */
dec_src_template = gst_pad_template_new ("src", GST_PAD_SRC,
gst_vorbisdec_src_template = gst_pad_template_new ("src", GST_PAD_SRC,
GST_PAD_ALWAYS,
raw_caps, NULL);
gst_element_factory_add_pad_template (dec, dec_src_template);
gst_element_factory_add_pad_template (dec, gst_vorbisdec_src_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec));
@ -154,9 +154,9 @@ plugin_init (GModule *module, GstPlugin *plugin)
gst_element_factory_set_rank (file, GST_ELEMENT_RANK_PRIMARY);
/* register sink pads */
gst_element_factory_add_pad_template (file, dec_sink_template);
gst_element_factory_add_pad_template (file, gst_vorbisdec_sink_template);
/* register src pads */
gst_element_factory_add_pad_template (file, dec_src_template);
gst_element_factory_add_pad_template (file, gst_vorbisdec_src_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (file));

6
ext/vorbis/vorbisdec.c
View file

@ -23,7 +23,7 @@
#include <vorbisdec.h>
extern GstPadTemplate *dec_src_template, *dec_sink_template;
extern GstPadTemplate *gst_vorbisdec_src_template, *gst_vorbisdec_sink_template;
/* elementfactory information */
GstElementDetails vorbisdec_details =
@ -137,11 +137,11 @@ gst_vorbisdec_class_init (VorbisDecClass * klass)
static void
gst_vorbisdec_init (VorbisDec * vorbisdec)
{
vorbisdec->sinkpad = gst_pad_new_from_template (dec_sink_template, "sink");
vorbisdec->sinkpad = gst_pad_new_from_template (gst_vorbisdec_sink_template, "sink");
gst_element_add_pad (GST_ELEMENT (vorbisdec), vorbisdec->sinkpad);
gst_element_set_loop_function (GST_ELEMENT (vorbisdec), gst_vorbisdec_loop);
vorbisdec->srcpad = gst_pad_new_from_template (dec_src_template, "src");
vorbisdec->srcpad = gst_pad_new_from_template (gst_vorbisdec_src_template, "src");
gst_element_add_pad (GST_ELEMENT (vorbisdec), vorbisdec->srcpad);
ogg_sync_init (&vorbisdec->oy); /* Now we can read pages */

6
ext/vorbis/vorbisenc.c
View file

@ -27,7 +27,7 @@
extern GstPadTemplate *enc_src_template, *enc_sink_template;
extern GstPadTemplate *gst_vorbisenc_src_template, *gst_vorbisenc_sink_template;
/* elementfactory information */
GstElementDetails vorbisenc_details = {
@ -133,12 +133,12 @@ gst_vorbisenc_sinkconnect (GstPad * pad, GstCaps * caps)
static void
gst_vorbisenc_init (VorbisEnc * vorbisenc)
{
vorbisenc->sinkpad = gst_pad_new_from_template (enc_sink_template, "sink");
vorbisenc->sinkpad = gst_pad_new_from_template (gst_vorbisenc_sink_template, "sink");
gst_element_add_pad (GST_ELEMENT (vorbisenc), vorbisenc->sinkpad);
gst_pad_set_chain_function (vorbisenc->sinkpad, gst_vorbisenc_chain);
gst_pad_set_connect_function (vorbisenc->sinkpad, gst_vorbisenc_sinkconnect);
vorbisenc->srcpad = gst_pad_new_from_template (enc_src_template, "src");
vorbisenc->srcpad = gst_pad_new_from_template (gst_vorbisenc_src_template, "src");
gst_element_add_pad (GST_ELEMENT (vorbisenc), vorbisenc->srcpad);
vorbisenc->channels = 2;

6
ext/vorbis/vorbisfile.c
View file

@ -67,7 +67,7 @@ struct _VorbisFileClass {
GType vorbisfile_get_type(void);
extern GstPadTemplate *dec_src_template, *dec_sink_template;
extern GstPadTemplate *gst_vorbisdec_src_template, *gst_vorbisdec_sink_template;
/* elementfactory information */
GstElementDetails vorbisfile_details =
@ -198,12 +198,12 @@ gst_vorbisfile_class_init (VorbisFileClass * klass)
static void
gst_vorbisfile_init (VorbisFile * vorbisfile)
{
vorbisfile->sinkpad = gst_pad_new_from_template (dec_sink_template, "sink");
vorbisfile->sinkpad = gst_pad_new_from_template (gst_vorbisdec_sink_template, "sink");
gst_element_add_pad (GST_ELEMENT (vorbisfile), vorbisfile->sinkpad);
gst_pad_set_convert_function (vorbisfile->sinkpad, NULL);
gst_element_set_loop_function (GST_ELEMENT (vorbisfile), gst_vorbisfile_loop);
vorbisfile->srcpad = gst_pad_new_from_template (dec_src_template, "src");
vorbisfile->srcpad = gst_pad_new_from_template (gst_vorbisdec_src_template, "src");
gst_element_add_pad (GST_ELEMENT (vorbisfile), vorbisfile->srcpad);
gst_pad_set_formats_function (vorbisfile->srcpad, gst_vorbisfile_get_formats);
gst_pad_set_query_type_function (vorbisfile->srcpad, gst_vorbisfile_get_query_types);