From 8ae0fd3990ef922b6dc8bb531cb1caf91926fec2 Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Thu, 1 Oct 2015 11:55:59 +0100 Subject: [PATCH] visual: merge audiovisalizer base classes Move the audiovisualizer base class to pbutils, so it can be used by plugins from other modules https://bugzilla.gnome.org/show_bug.cgi?id=742875 --- ext/libvisual/Makefile.am | 7 ++++--- ext/libvisual/visual.h | 2 +- gst-libs/gst/pbutils/Makefile.am | 6 ++++-- .../gst/pbutils}/gstaudiovisualizer.c | 10 +++++----- .../gst/pbutils}/gstaudiovisualizer.h | 4 ++-- 5 files changed, 16 insertions(+), 13 deletions(-) rename {ext/libvisual => gst-libs/gst/pbutils}/gstaudiovisualizer.c (99%) rename {ext/libvisual => gst-libs/gst/pbutils}/gstaudiovisualizer.h (96%) diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am index a996b8ea27..73d1e20999 100644 --- a/ext/libvisual/Makefile.am +++ b/ext/libvisual/Makefile.am @@ -1,12 +1,13 @@ plugin_LTLIBRARIES = libgstlibvisual.la -libgstlibvisual_la_SOURCES = plugin.c visual.c gstaudiovisualizer.c +libgstlibvisual_la_SOURCES = plugin.c visual.c libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS) libgstlibvisual_la_LIBADD = \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ - $(GST_BASE_LIBS) $(LIBVISUAL_LIBS) + $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-$(GST_API_VERSION).la \ + $(GST_BASE_LIBS) $(GST_LIBS) $(LIBVISUAL_LIBS) libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstlibvisual_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) -noinst_HEADERS = visual.h gstaudiovisualizer.h +noinst_HEADERS = visual.h diff --git a/ext/libvisual/visual.h b/ext/libvisual/visual.h index 5d8b51ced8..7ea41af930 100644 --- a/ext/libvisual/visual.h +++ b/ext/libvisual/visual.h @@ -28,7 +28,7 @@ #include #include -#include "gstaudiovisualizer.h" +#include "gst/pbutils/gstaudiovisualizer.h" G_BEGIN_DECLS diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index 64d5eb0876..c941195cb0 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -8,7 +8,8 @@ headers_pbutils = \ encoding-target.h \ install-plugins.h \ missing-plugins.h \ - gstdiscoverer.h + gstdiscoverer.h \ + gstaudiovisualizer.h # variables used for enum/marshal generation glib_enum_headers = $(headers_pbutils) @@ -29,7 +30,8 @@ libgstpbutils_@GST_API_VERSION@_la_SOURCES = \ install-plugins.c \ missing-plugins.c \ gstdiscoverer.c \ - gstdiscoverer-types.c + gstdiscoverer-types.c \ + gstaudiovisualizer.c nodist_libgstpbutils_@GST_API_VERSION@_la_SOURCES = \ pbutils-enumtypes.c diff --git a/ext/libvisual/gstaudiovisualizer.c b/gst-libs/gst/pbutils/gstaudiovisualizer.c similarity index 99% rename from ext/libvisual/gstaudiovisualizer.c rename to gst-libs/gst/pbutils/gstaudiovisualizer.c index 805336d60f..34a5793fa8 100644 --- a/ext/libvisual/gstaudiovisualizer.c +++ b/gst-libs/gst/pbutils/gstaudiovisualizer.c @@ -65,7 +65,7 @@ static void gst_audio_visualizer_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void gst_audio_visualizer_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static void gst_audio_visualizer_finalize (GObject * object); +static void gst_audio_visualizer_dispose (GObject * object); static gboolean gst_audio_visualizer_src_negotiate (GstAudioVisualizer * scope); static gboolean gst_audio_visualizer_src_setcaps (GstAudioVisualizer * @@ -546,7 +546,7 @@ gst_audio_visualizer_change_shader (GstAudioVisualizer * scope) /* base class */ GType -libvisual_gst_audio_visualizer_get_type (void) +gst_audio_visualizer_get_type (void) { static volatile gsize audio_visualizer_type = 0; @@ -589,7 +589,7 @@ gst_audio_visualizer_class_init (GstAudioVisualizerClass * klass) gobject_class->set_property = gst_audio_visualizer_set_property; gobject_class->get_property = gst_audio_visualizer_get_property; - gobject_class->finalize = gst_audio_visualizer_finalize; + gobject_class->dispose = gst_audio_visualizer_dispose; element_class->change_state = GST_DEBUG_FUNCPTR (gst_audio_visualizer_change_state); @@ -696,7 +696,7 @@ gst_audio_visualizer_get_property (GObject * object, guint prop_id, } static void -gst_audio_visualizer_finalize (GObject * object) +gst_audio_visualizer_dispose (GObject * object) { GstAudioVisualizer *scope = GST_AUDIO_VISUALIZER (object); GstAudioVisualizerPrivate *priv = scope->priv; @@ -717,7 +717,7 @@ gst_audio_visualizer_finalize (GObject * object) g_mutex_clear (&priv->config_lock); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (parent_class)->dispose (object); } static void diff --git a/ext/libvisual/gstaudiovisualizer.h b/gst-libs/gst/pbutils/gstaudiovisualizer.h similarity index 96% rename from ext/libvisual/gstaudiovisualizer.h rename to gst-libs/gst/pbutils/gstaudiovisualizer.h index 9dbf0bcc14..71fd9b1de8 100644 --- a/ext/libvisual/gstaudiovisualizer.h +++ b/gst-libs/gst/pbutils/gstaudiovisualizer.h @@ -31,7 +31,7 @@ #include G_BEGIN_DECLS -#define GST_TYPE_AUDIO_VISUALIZER (libvisual_gst_audio_visualizer_get_type()) +#define GST_TYPE_AUDIO_VISUALIZER (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)) @@ -100,7 +100,7 @@ struct _GstAudioVisualizerClass gboolean (*decide_allocation) (GstAudioVisualizer * scope, GstQuery *query); }; -GType libvisual_gst_audio_visualizer_get_type (void); +GType gst_audio_visualizer_get_type (void); G_END_DECLS #endif /* __GST_AUDIO_VISUALIZER_H__ */