FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

vorbisdec: Fix GType name conflict if tremor and libvorbis decoder are used in the same process

Browse Source
This commit is contained in:
Sebastian Dröge 2012-11-13 15:40:14 +01:00
parent 6313e5f1af
commit 858392f88a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/vorbis/gstvorbisdec.c
View File

@ -69,7 +69,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
); );
#define gst_vorbis_dec_parent_class parent_class #define gst_vorbis_dec_parent_class parent_class
G_DEFINE_TYPE (GstVorbisDec, gst_vorbis_dec, GST_TYPE_AUDIO_DECODER); G_DEFINE_TYPE (GST_VORBIS_DEC_GLIB_TYPE_NAME, gst_vorbis_dec,
GST_TYPE_AUDIO_DECODER);
static void vorbis_dec_finalize (GObject * object); static void vorbis_dec_finalize (GObject * object);

5
ext/vorbis/gstvorbisdeclib.h
View File

@ -43,6 +43,8 @@
#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (32) #define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (32)
#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstVorbisDec
#else /* TREMOR */ #else /* TREMOR */
#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio" #define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
@ -59,6 +61,9 @@
#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16) #define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16)
/* we need a different type name here */ /* we need a different type name here */
#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec
/* and still have it compile */
#define GstVorbisDec GstIVorbisDec #define GstVorbisDec GstIVorbisDec
#define GstVorbisDecClass GstIVorbisDecClass #define GstVorbisDecClass GstIVorbisDecClass