alsa: element_init returns void

no need to return boolean as it will
be always TRUE.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1029>

diff --git a/ext/alsa/gstalsaelement.c b/ext/alsa/gstalsaelement.c
index c6ad28b..695537a 100644 (file)
--- a/ext/alsa/gstalsaelement.c
+++ b/ext/alsa/gstalsaelement.c
@@ -59,7 +59,7 @@ gst_alsa_error_wrapper (const char *file, int line, const char *function,
 GST_DEVICE_PROVIDER_REGISTER_DEFINE (alsadeviceprovider, "alsadeviceprovider",
     GST_RANK_SECONDARY, GST_TYPE_ALSA_DEVICE_PROVIDER);
 
-gboolean
+void
 alsa_element_init (GstPlugin * plugin)
 {
   static gsize res = FALSE;
@@ -76,5 +76,4 @@ alsa_element_init (GstPlugin * plugin)
       GST_WARNING ("failed to set alsa error handler");
     g_once_init_leave (&res, TRUE);
   }
-  return res;
 }

diff --git a/ext/alsa/gstalsaelements.h b/ext/alsa/gstalsaelements.h
index 60edff7..ef48f46 100644 (file)
--- a/ext/alsa/gstalsaelements.h
+++ b/ext/alsa/gstalsaelements.h
@@ -24,7 +24,7 @@
 
 G_BEGIN_DECLS
 
-G_GNUC_INTERNAL gboolean alsa_element_init (GstPlugin * plugin);
+G_GNUC_INTERNAL void alsa_element_init (GstPlugin * plugin);
 
 GST_ELEMENT_REGISTER_DECLARE (alsasrc);
 GST_ELEMENT_REGISTER_DECLARE (alsasink);

diff --git a/ext/alsa/gstalsamidisrc.c b/ext/alsa/gstalsamidisrc.c
index 96d4207..8816562 100644 (file)
--- a/ext/alsa/gstalsamidisrc.c
+++ b/ext/alsa/gstalsamidisrc.c
@@ -301,15 +301,12 @@ enum
   PROP_LAST,
 };
 
-#define _do_init \
-    GST_DEBUG_CATEGORY_INIT (gst_alsa_midi_src_debug, "alsamidisrc", 0, "alsamidisrc element");
 #define gst_alsa_midi_src_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstAlsaMidiSrc, gst_alsa_midi_src, GST_TYPE_PUSH_SRC,
-    _do_init);
-#define _do_element_init \
-    alsa_element_init (plugin);
+    GST_DEBUG_CATEGORY_INIT (gst_alsa_midi_src_debug, "alsamidisrc", 0,
+        "alsamidisrc element"));
 GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (alsamidisrc, "alsamidisrc",
-    GST_RANK_PRIMARY, GST_TYPE_ALSA_MIDI_SRC, _do_element_init);
+    GST_RANK_PRIMARY, GST_TYPE_ALSA_MIDI_SRC, alsa_element_init (plugin));
 
 static void gst_alsa_midi_src_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);

diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c
index 9bdf93a..e2eca19 100644 (file)
--- a/ext/alsa/gstalsasink.c
+++ b/ext/alsa/gstalsasink.c
@@ -73,12 +73,10 @@ enum
   PROP_LAST
 };
 
-#define _do_init \
-    alsa_element_init (plugin);
 #define gst_alsasink_parent_class parent_class
 G_DEFINE_TYPE (GstAlsaSink, gst_alsasink, GST_TYPE_AUDIO_SINK);
 GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (alsasink, "alsasink", GST_RANK_PRIMARY,
-    GST_TYPE_ALSA_SINK, _do_init);
+    GST_TYPE_ALSA_SINK, alsa_element_init (plugin));
 
 static void gst_alsasink_finalise (GObject * object);
 static void gst_alsasink_set_property (GObject * object,

diff --git a/ext/alsa/gstalsasrc.c b/ext/alsa/gstalsasrc.c
index a0dccbb..00667ea 100644 (file)
--- a/ext/alsa/gstalsasrc.c
+++ b/ext/alsa/gstalsasrc.c
@@ -71,10 +71,8 @@ enum
 
 #define gst_alsasrc_parent_class parent_class
 G_DEFINE_TYPE (GstAlsaSrc, gst_alsasrc, GST_TYPE_AUDIO_SRC);
-#define _do_init \
-    alsa_element_init (plugin);
 GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (alsasrc, "alsasrc", GST_RANK_PRIMARY,
-    GST_TYPE_ALSA_SRC, _do_init);
+    GST_TYPE_ALSA_SRC, alsa_element_init (plugin));
 
 static void gst_alsasrc_finalize (GObject * object);
 static void gst_alsasrc_set_property (GObject * object,