From: Sebastian Dröge <sebastian@centricular.com>
Date: Fri, 14 Aug 2015 07:21:25 +0000 (+0200)
Subject: goom: Rename get_type() function of base class to prevent symbol conflicts
X-Git-Tag: 1.6.0~79
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ede3105d608fce2ccd6659eee02c6506bd75319;p=platform%2Fupstream%2Fgst-plugins-good.git

goom: Rename get_type() function of base class to prevent symbol conflicts

This is a problem when statically linking.
---

diff --git a/gst/goom/gstaudiovisualizer.c b/gst/goom/gstaudiovisualizer.c
index 3e8f3c3..e643de4 100644
--- a/gst/goom/gstaudiovisualizer.c
+++ b/gst/goom/gstaudiovisualizer.c
@@ -543,7 +543,7 @@ gst_audio_visualizer_change_shader (GstAudioVisualizer * scope)
 /* class */
 
 GType
-gst_audio_visualizer_get_type (void)
+goom_gst_audio_visualizer_get_type (void)
 {
   static volatile gsize audio_visualizer_type = 0;
 
diff --git a/gst/goom/gstaudiovisualizer.h b/gst/goom/gstaudiovisualizer.h
index 0fdb1fa..ea8444b 100644
--- a/gst/goom/gstaudiovisualizer.h
+++ b/gst/goom/gstaudiovisualizer.h
@@ -30,7 +30,7 @@
 #include <gst/base/gstadapter.h>
 
 G_BEGIN_DECLS
-#define GST_TYPE_AUDIO_VISUALIZER            (gst_audio_visualizer_get_type())
+#define GST_TYPE_AUDIO_VISUALIZER            (goom_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))
@@ -99,7 +99,7 @@ struct _GstAudioVisualizerClass
   gboolean (*decide_allocation)   (GstAudioVisualizer * scope, GstQuery *query);
 };
 
-GType gst_audio_visualizer_get_type (void);
+GType goom_gst_audio_visualizer_get_type (void);
 
 G_END_DECLS
 #endif /* __GST_AUDIO_VISUALIZER_H__ */
diff --git a/gst/goom2k1/gstaudiovisualizer.c b/gst/goom2k1/gstaudiovisualizer.c
index 66b03b6..fbd298d 100644
--- a/gst/goom2k1/gstaudiovisualizer.c
+++ b/gst/goom2k1/gstaudiovisualizer.c
@@ -543,7 +543,7 @@ gst_audio_visualizer_change_shader (GstAudioVisualizer * scope)
 /* class */
 
 GType
-gst_audio_visualizer_get_type (void)
+goom2k1_gst_audio_visualizer_get_type (void)
 {
   static volatile gsize audio_visualizer_type = 0;
 
diff --git a/gst/goom2k1/gstaudiovisualizer.h b/gst/goom2k1/gstaudiovisualizer.h
index 0fdb1fa..9a618ab 100644
--- a/gst/goom2k1/gstaudiovisualizer.h
+++ b/gst/goom2k1/gstaudiovisualizer.h
@@ -30,7 +30,7 @@
 #include <gst/base/gstadapter.h>
 
 G_BEGIN_DECLS
-#define GST_TYPE_AUDIO_VISUALIZER            (gst_audio_visualizer_get_type())
+#define GST_TYPE_AUDIO_VISUALIZER            (goom2k1_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))
@@ -99,7 +99,7 @@ struct _GstAudioVisualizerClass
   gboolean (*decide_allocation)   (GstAudioVisualizer * scope, GstQuery *query);
 };
 
-GType gst_audio_visualizer_get_type (void);
+GType goom2k1_gst_audio_visualizer_get_type (void);
 
 G_END_DECLS
 #endif /* __GST_AUDIO_VISUALIZER_H__ */