diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-06-28 17:08:06 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-06-28 17:08:06 +0200 |
| commit | 1db76ee66e4ab049062723f83f30892750631395 (patch) | |
| tree | 04d39b519dc12f38872359560164ffcdf1e9b02a | |
| parent | ae464e470472b44f682154a8421968b1d16427a2 (diff) | |
libvisual: Rename get_type() function to prevent conflicts with static linking
https://bugzilla.gnome.org/show_bug.cgi?id=728443
| -rw-r--r-- | ext/libvisual/gstaudiovisualizer.c | 2 | ||||
| -rw-r--r-- | ext/libvisual/gstaudiovisualizer.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/libvisual/gstaudiovisualizer.c b/ext/libvisual/gstaudiovisualizer.c index b34a5d693..3d5a39cad 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 7f8f8d882..a9b7a9cf8 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__ */ |