[gst-cvs] gst-plugins-bad: amrwbenc: use different element GType name to avoid conflict with previous plugin

[Tim Mueller]

Module: gst-plugins-bad
Branch: master
Commit: d652fff69005e20327d2a36484ee872174a5eb63
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=d652fff69005e20327d2a36484ee872174a5eb63

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Mon Aug 24 18:16:15 2009 +0100

amrwbenc: use different element GType name to avoid conflict with previous plugin

Use a different GType name for the element to avoid 'cannot register existing type'
warnings when running 'make check' in the unpacked tarball with the old amrwb plugin
also installed as system plugin under the old name (it used to be called 'amrwrb'
and now it's 'amrwbenc').

---

 ext/amrwbenc/gstamrwbenc.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ext/amrwbenc/gstamrwbenc.c b/ext/amrwbenc/gstamrwbenc.c
index 3b46d3e..f9587cc 100644
--- a/ext/amrwbenc/gstamrwbenc.c
+++ b/ext/amrwbenc/gstamrwbenc.c
@@ -73,7 +73,7 @@ gst_amrwbenc_bandmode_get_type ()
   };
   if (!gst_amrwbenc_bandmode_type) {
     gst_amrwbenc_bandmode_type =
-        g_enum_register_static ("GstAmrwbEncBandMode", gst_amrwbenc_bandmode);
+        g_enum_register_static ("GstAmrWbEncBandMode", gst_amrwbenc_bandmode);
   }
   return gst_amrwbenc_bandmode_type;
 }
@@ -132,7 +132,10 @@ _do_init (GType object_type)
       "AMR-WB audio encoder");
 }
 
-GST_BOILERPLATE_FULL (GstAmrwbEnc, gst_amrwbenc, GstElement, GST_TYPE_ELEMENT,
+#define GstAmrWbEnc GstAmrwbEnc
+#define GstAmrWbEncClass GstAmrwbEncClass
+
+GST_BOILERPLATE_FULL (GstAmrWbEnc, gst_amrwbenc, GstElement, GST_TYPE_ELEMENT,
     _do_init);
 
 static void