mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=728443
This commit is contained in:
Sebastian Dröge 2014-06-28 17:08:06 +02:00
parent ae464e4704
commit 1db76ee66e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/libvisual/gstaudiovisualizer.c
View file

@ -503,7 +503,7 @@ struct _GstAudioVisualizerPrivate
}; };
GType GType
gst_audio_visualizer_get_type (void) libvisual_gst_audio_visualizer_get_type (void)
{ {
static volatile gsize audio_visualizer_type = 0; static volatile gsize audio_visualizer_type = 0;

4
ext/libvisual/gstaudiovisualizer.h
View file

@ -29,7 +29,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 (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(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))
@ -121,7 +121,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 libvisual_gst_audio_visualizer_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_AUDIO_VISUALIZER_H__ */ #endif /* __GST_AUDIO_VISUALIZER_H__ */