From b44ed86c3146256597f3cece1fe0270947a745b5 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sun, 28 Jul 2002 19:51:29 +0000 Subject: [PATCH] Avoid symbol conflicts Original commit message from CVS: Avoid symbol conflicts --- ext/vorbis/vorbis.c | 24 ++++++++++++------------ ext/vorbis/vorbisdec.c | 6 +++--- ext/vorbis/vorbisenc.c | 6 +++--- ext/vorbis/vorbisfile.c | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ext/vorbis/vorbis.c b/ext/vorbis/vorbis.c index 20cca01ad3..a5a6334949 100644 --- a/ext/vorbis/vorbis.c +++ b/ext/vorbis/vorbis.c @@ -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)); diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c index d37b228577..86970124a1 100644 --- a/ext/vorbis/vorbisdec.c +++ b/ext/vorbis/vorbisdec.c @@ -23,7 +23,7 @@ #include -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 */ diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c index ec44e5be3a..7375f2bc09 100644 --- a/ext/vorbis/vorbisenc.c +++ b/ext/vorbis/vorbisenc.c @@ -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; diff --git a/ext/vorbis/vorbisfile.c b/ext/vorbis/vorbisfile.c index aca1863939..866f8c74d0 100644 --- a/ext/vorbis/vorbisfile.c +++ b/ext/vorbis/vorbisfile.c @@ -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);