mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +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:48:26 +00:00
parent 7168a7b9c0
commit ced0529b53
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ext/flac/gstflac.c
View file

@ -26,8 +26,8 @@ extern GstElementDetails flacdec_details;
static GstCaps* flac_type_find (GstBuffer *buf, gpointer private); static GstCaps* flac_type_find (GstBuffer *buf, gpointer private);
GstPadTemplate *dec_src_template, *dec_sink_template; GstPadTemplate *gst_flacdec_src_template, *gst_flacdec_sink_template;
GstPadTemplate *enc_src_template, *enc_sink_template; GstPadTemplate *gst_flacenc_src_template, *gst_flacenc_sink_template;
static GstCaps* static GstCaps*
flac_caps_factory (void) flac_caps_factory (void)
@ -101,16 +101,16 @@ plugin_init (GModule *module, GstPlugin *plugin)
flac_caps = flac_caps_factory (); flac_caps = flac_caps_factory ();
/* register sink pads */ /* register sink pads */
enc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, gst_flacenc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
raw_caps, NULL); raw_caps, NULL);
gst_element_factory_add_pad_template (enc, enc_sink_template); gst_element_factory_add_pad_template (enc, gst_flacenc_sink_template);
/* register src pads */ /* register src pads */
enc_src_template = gst_pad_template_new ("src", GST_PAD_SRC, gst_flacenc_src_template = gst_pad_template_new ("src", GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
flac_caps, NULL); flac_caps, NULL);
gst_element_factory_add_pad_template (enc, enc_src_template); gst_element_factory_add_pad_template (enc, gst_flacenc_src_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc)); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc));
@ -121,16 +121,16 @@ plugin_init (GModule *module, GstPlugin *plugin)
gst_element_factory_set_rank (dec, GST_ELEMENT_RANK_PRIMARY); gst_element_factory_set_rank (dec, GST_ELEMENT_RANK_PRIMARY);
/* register sink pads */ /* register sink pads */
dec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, gst_flacdec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
flac_caps, NULL); flac_caps, NULL);
gst_element_factory_add_pad_template (dec, dec_sink_template); gst_element_factory_add_pad_template (dec, gst_flacdec_sink_template);
/* register src pads */ /* register src pads */
dec_src_template = gst_pad_template_new ("src", GST_PAD_SRC, gst_flacdec_src_template = gst_pad_template_new ("src", GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
raw_caps, NULL); raw_caps, NULL);
gst_element_factory_add_pad_template (dec, dec_src_template); gst_element_factory_add_pad_template (dec, gst_flacdec_src_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec)); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec));

6
ext/flac/gstflacdec.c
View file

@ -24,7 +24,7 @@
#include "gstflacdec.h" #include "gstflacdec.h"
extern GstPadTemplate *dec_src_template, *dec_sink_template; extern GstPadTemplate *gst_flacdec_src_template, *gst_flacdec_sink_template;
/* elementfactory information */ /* elementfactory information */
GstElementDetails flacdec_details = { GstElementDetails flacdec_details = {
@ -127,12 +127,12 @@ gst_flacdec_class_init (FlacDecClass *klass)
static void static void
gst_flacdec_init (FlacDec *flacdec) gst_flacdec_init (FlacDec *flacdec)
{ {
flacdec->sinkpad = gst_pad_new_from_template (dec_sink_template, "sink"); flacdec->sinkpad = gst_pad_new_from_template (gst_flacdec_sink_template, "sink");
gst_element_add_pad (GST_ELEMENT (flacdec), flacdec->sinkpad); gst_element_add_pad (GST_ELEMENT (flacdec), flacdec->sinkpad);
gst_pad_set_convert_function (flacdec->sinkpad, NULL); gst_pad_set_convert_function (flacdec->sinkpad, NULL);
gst_element_set_loop_function (GST_ELEMENT (flacdec), gst_flacdec_loop); gst_element_set_loop_function (GST_ELEMENT (flacdec), gst_flacdec_loop);
flacdec->srcpad = gst_pad_new_from_template (dec_src_template, "src"); flacdec->srcpad = gst_pad_new_from_template (gst_flacdec_src_template, "src");
gst_element_add_pad (GST_ELEMENT (flacdec), flacdec->srcpad); gst_element_add_pad (GST_ELEMENT (flacdec), flacdec->srcpad);
gst_pad_set_formats_function (flacdec->srcpad, gst_flacdec_get_src_formats); gst_pad_set_formats_function (flacdec->srcpad, gst_flacdec_get_src_formats);
gst_pad_set_convert_function (flacdec->srcpad, gst_flacdec_convert_src); gst_pad_set_convert_function (flacdec->srcpad, gst_flacdec_convert_src);

6
ext/flac/gstflacenc.c
View file

@ -23,7 +23,7 @@
#include <gstflacenc.h> #include <gstflacenc.h>
extern GstPadTemplate *enc_src_template, *enc_sink_template; extern GstPadTemplate *gst_flacenc_src_template, *gst_flacenc_sink_template;
/* elementfactory information */ /* elementfactory information */
GstElementDetails flacenc_details = { GstElementDetails flacenc_details = {
@ -124,12 +124,12 @@ gst_flacenc_sinkconnect (GstPad *pad, GstCaps *caps)
static void static void
gst_flacenc_init (FlacEnc *flacenc) gst_flacenc_init (FlacEnc *flacenc)
{ {
flacenc->sinkpad = gst_pad_new_from_template (enc_sink_template, "sink"); flacenc->sinkpad = gst_pad_new_from_template (gst_flacenc_sink_template, "sink");
gst_element_add_pad(GST_ELEMENT(flacenc),flacenc->sinkpad); gst_element_add_pad(GST_ELEMENT(flacenc),flacenc->sinkpad);
gst_pad_set_chain_function(flacenc->sinkpad,gst_flacenc_chain); gst_pad_set_chain_function(flacenc->sinkpad,gst_flacenc_chain);
gst_pad_set_connect_function (flacenc->sinkpad, gst_flacenc_sinkconnect); gst_pad_set_connect_function (flacenc->sinkpad, gst_flacenc_sinkconnect);
flacenc->srcpad = gst_pad_new_from_template (enc_src_template, "src"); flacenc->srcpad = gst_pad_new_from_template (gst_flacenc_src_template, "src");
gst_element_add_pad(GST_ELEMENT(flacenc),flacenc->srcpad); gst_element_add_pad(GST_ELEMENT(flacenc),flacenc->srcpad);
flacenc->first = TRUE; flacenc->first = TRUE;