From a750bc8f23d6dda97e7d07a1443e6e1a35c9d403 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Cerveau?= Date: Tue, 16 Mar 2021 12:59:14 +0100 Subject: [PATCH] playback: element_init returns void no need to return boolean as it will be always TRUE. Part-of: --- gst/playback/gstplaybackelement.c | 4 ++-- gst/playback/gstplaybackelements.h | 2 +- gst/playback/gstplaybin3.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/playback/gstplaybackelement.c b/gst/playback/gstplaybackelement.c index 7ac053b..8505fdf 100644 --- a/gst/playback/gstplaybackelement.c +++ b/gst/playback/gstplaybackelement.c @@ -36,10 +36,11 @@ #include "gstplaybackelements.h" -gboolean +void playback_element_init (GstPlugin * plugin) { static gsize res = FALSE; + if (g_once_init_enter (&res)) { gst_pb_utils_init (); @@ -51,5 +52,4 @@ playback_element_init (GstPlugin * plugin) #endif /* ENABLE_NLS */ g_once_init_leave (&res, TRUE); } - return res; } diff --git a/gst/playback/gstplaybackelements.h b/gst/playback/gstplaybackelements.h index e08608d..51ddc0c 100644 --- a/gst/playback/gstplaybackelements.h +++ b/gst/playback/gstplaybackelements.h @@ -39,6 +39,6 @@ GST_ELEMENT_REGISTER_DECLARE (parsebin); gboolean gst_play_bin_custom_element_init (GstPlugin * plugin); gboolean gst_play_bin3_custom_element_init (GstPlugin * plugin); -G_GNUC_INTERNAL gboolean playback_element_init (GstPlugin * plugin); +G_GNUC_INTERNAL void playback_element_init (GstPlugin * plugin); #endif /* __GST_PLAY_BACK_ELEMENTS_H__ */ diff --git a/gst/playback/gstplaybin3.c b/gst/playback/gstplaybin3.c index 753e12d..60dd2af 100644 --- a/gst/playback/gstplaybin3.c +++ b/gst/playback/gstplaybin3.c @@ -5154,7 +5154,7 @@ gst_play_bin3_custom_element_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (gst_play_bin3_debug, "playbin3", 0, "play bin3"); - ret &= playback_element_init (plugin); + playback_element_init (plugin); if (g_getenv ("USE_PLAYBIN3")) ret &= gst_element_register (plugin, "playbin", GST_RANK_NONE, -- 2.7.4