From: Sebastian Dröge <sebastian@centricular.com>
Date: Sat, 28 Jun 2014 15:08:06 +0000 (+0200)
Subject: libvisual: Rename get_type() function to prevent conflicts with static linking
X-Git-Tag: 1.19.3~511^2~4460
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1db76ee66e4ab049062723f83f30892750631395;p=platform%2Fupstream%2Fgstreamer.git

libvisual: Rename get_type() function to prevent conflicts with static linking

https://bugzilla.gnome.org/show_bug.cgi?id=728443
---

diff --git a/ext/libvisual/gstaudiovisualizer.c b/ext/libvisual/gstaudiovisualizer.c
index b34a5d6..3d5a39c 100644
--- a/ext/libvisual/gstaudiovisualizer.c
+++ b/ext/libvisual/gstaudiovisualizer.c
@@ -503,7 +503,7 @@ struct _GstAudioVisualizerPrivate
 };
 
 GType
-gst_audio_visualizer_get_type (void)
+libvisual_gst_audio_visualizer_get_type (void)
 {
   static volatile gsize audio_visualizer_type = 0;
 
diff --git a/ext/libvisual/gstaudiovisualizer.h b/ext/libvisual/gstaudiovisualizer.h
index 7f8f8d8..a9b7a9c 100644
--- a/ext/libvisual/gstaudiovisualizer.h
+++ b/ext/libvisual/gstaudiovisualizer.h
@@ -29,7 +29,7 @@
 #include <gst/base/gstadapter.h>
 
 G_BEGIN_DECLS
-#define GST_TYPE_AUDIO_VISUALIZER            (gst_audio_visualizer_get_type())
+#define GST_TYPE_AUDIO_VISUALIZER            (libvisual_gst_audio_visualizer_get_type())
 #define GST_AUDIO_VISUALIZER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizer))
 #define GST_AUDIO_VISUALIZER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizerClass))
 #define GST_AUDIO_VISUALIZER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_AUDIO_VISUALIZER,GstAudioVisualizerClass))
@@ -121,7 +121,7 @@ struct _GstAudioVisualizerClass
   gboolean (*decide_allocation)   (GstAudioVisualizer * scope, GstQuery *query);
 };
 
-GType gst_audio_visualizer_get_type (void);
+GType libvisual_gst_audio_visualizer_get_type (void);
 
 G_END_DECLS
 #endif /* __GST_AUDIO_VISUALIZER_H__ */