mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
This is a problem when statically linking.
This commit is contained in:
Sebastian Dröge 2015-08-14 09:21:25 +02:00
parent 68a9209408
commit 3ede3105d6
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/goom/gstaudiovisualizer.c
View file

@ -543,7 +543,7 @@ gst_audio_visualizer_change_shader (GstAudioVisualizer * scope)
/* class */ /* class */
GType GType
gst_audio_visualizer_get_type (void) goom_gst_audio_visualizer_get_type (void)
{ {
static volatile gsize audio_visualizer_type = 0; static volatile gsize audio_visualizer_type = 0;

4
gst/goom/gstaudiovisualizer.h
View file

@ -30,7 +30,7 @@
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
G_BEGIN_DECLS 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(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_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)) #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); 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 G_END_DECLS
#endif /* __GST_AUDIO_VISUALIZER_H__ */ #endif /* __GST_AUDIO_VISUALIZER_H__ */

2
gst/goom2k1/gstaudiovisualizer.c
View file

@ -543,7 +543,7 @@ gst_audio_visualizer_change_shader (GstAudioVisualizer * scope)
/* class */ /* class */
GType GType
gst_audio_visualizer_get_type (void) goom2k1_gst_audio_visualizer_get_type (void)
{ {
static volatile gsize audio_visualizer_type = 0; static volatile gsize audio_visualizer_type = 0;

4
gst/goom2k1/gstaudiovisualizer.h
View file

@ -30,7 +30,7 @@
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
G_BEGIN_DECLS 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(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_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)) #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); 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 G_END_DECLS
#endif /* __GST_AUDIO_VISUALIZER_H__ */ #endif /* __GST_AUDIO_VISUALIZER_H__ */