Revert "vorbisdec: Fix GType name conflict if tremor and libvorbis decoder are used...

This reverts commit 858392f88a1221afa29e6b08b283d5472be69b62.

A similar, cleaner fix was already in place.

diff --git a/ext/vorbis/gstvorbisdec.c b/ext/vorbis/gstvorbisdec.c
index 9148a8f..7f00a5c 100644 (file)
--- a/ext/vorbis/gstvorbisdec.c
+++ b/ext/vorbis/gstvorbisdec.c
@@ -69,8 +69,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     );
 
 #define gst_vorbis_dec_parent_class parent_class
-G_DEFINE_TYPE (GST_VORBIS_DEC_GLIB_TYPE_NAME, gst_vorbis_dec,
-    GST_TYPE_AUDIO_DECODER);
+G_DEFINE_TYPE (GstVorbisDec, 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 b6ff2a9..552ee43 100644 (file)
--- 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,9 +59,6 @@
 #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