From 858392f88a1221afa29e6b08b283d5472be69b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 13 Nov 2012 15:40:14 +0100
Subject: [PATCH] vorbisdec: Fix GType name conflict if tremor and libvorbis
 decoder are used in the same process

---
 ext/vorbis/gstvorbisdec.c    | 3 ++-
 ext/vorbis/gstvorbisdeclib.h | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ext/vorbis/gstvorbisdec.c b/ext/vorbis/gstvorbisdec.c
index 7f00a5c5fd..9148a8fc56 100644
--- a/ext/vorbis/gstvorbisdec.c
+++ b/ext/vorbis/gstvorbisdec.c
@@ -69,7 +69,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     );
 
 #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);
 
diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h
index 552ee43aac..b6ff2a9645 100644
--- a/ext/vorbis/gstvorbisdeclib.h
+++ b/ext/vorbis/gstvorbisdeclib.h
@@ -43,6 +43,8 @@
 
 #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"
@@ -59,6 +61,9 @@
 #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 */
 #define GstVorbisDec GstIVorbisDec
 #define GstVorbisDecClass GstIVorbisDecClass