From 6d27a26d57d19b2b9b8e31180324277e66fb5974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 16 May 2012 15:10:41 +0100 Subject: [PATCH] vorbis: give libvorbis-based decoder and vorbisidec decoder different type names Should fix "cannot register existing type `GstVorbisDec'" criticals when both libvorbis and vorbisidec are available. https://bugzilla.gnome.org/show_bug.cgi?id=673333 --- ext/vorbis/gstvorbisdeclib.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h index caefa402bb..8f69bda40f 100644 --- a/ext/vorbis/gstvorbisdeclib.h +++ b/ext/vorbis/gstvorbisdeclib.h @@ -43,8 +43,6 @@ #define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (32) -#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstVorbisDec - #else /* TREMOR */ #define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio" @@ -61,11 +59,8 @@ #define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16) /* we need a different type name here */ -#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec - -/* and still have it compile */ -typedef struct _GstVorbisDec GstIVorbisDec; -typedef struct _GstVorbisDecClass GstIVorbisDecClass; +#define GstVorbisDec GstIVorbisDec +#define GstVorbisDecClass GstIVorbisDecClass #endif /* TREMOR */