mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

g_thread_init() is deprecated in glib master

Browse source 
It's not needed any longer.
This commit is contained in:
Tim-Philipp Müller 2011-12-03 17:40:53 +00:00
parent ff96aeee84
commit fef18639db
6 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/gst.c
View file

@ -360,6 +360,9 @@ gst_init_get_option_group (void)
{NULL} {NULL}
}; };
/* Since GLib 2.31.0 threading is always enabled and g_thread_init()
* is not needed any longer and deprecated */
#if !GLIB_CHECK_VERSION (2, 31, 0)
/* Since GLib 2.23.2 calling g_thread_init() 'late' is allowed and is /* Since GLib 2.23.2 calling g_thread_init() 'late' is allowed and is
* automatically done as part of g_type_init() */ * automatically done as part of g_type_init() */
if (glib_check_version (2, 23, 3)) { if (glib_check_version (2, 23, 3)) {
@ -381,6 +384,7 @@ gst_init_get_option_group (void)
} else { } else {
/* GLib >= 2.23.2 */ /* GLib >= 2.23.2 */
} }
#endif
group = g_option_group_new ("gst", _("GStreamer Options"), group = g_option_group_new ("gst", _("GStreamer Options"),
_("Show GStreamer Options"), NULL, NULL); _("Show GStreamer Options"), NULL, NULL);
@ -424,8 +428,10 @@ gst_init_check (int *argc, char **argv[], GError ** err)
#endif #endif
gboolean res; gboolean res;
#if !GLIB_CHECK_VERSION (2, 31, 0)
if (!g_thread_get_initialized ()) if (!g_thread_get_initialized ())
g_thread_init (NULL); g_thread_init (NULL);
#endif
if (gst_initialized) { if (gst_initialized) {
GST_DEBUG ("already initialized gst"); GST_DEBUG ("already initialized gst");
@ -574,8 +580,10 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data,
g_type_init (); g_type_init ();
#if !GLIB_CHECK_VERSION (2, 31, 0)
/* we need threading to be enabled right here */ /* we need threading to be enabled right here */
g_assert (g_thread_get_initialized ()); g_assert (g_thread_get_initialized ());
#endif
_gst_debug_init (); _gst_debug_init ();

2
libs/gst/helpers/gst-plugin-scanner.c
View file

@ -41,8 +41,10 @@ main (int argc, char *argv[])
if (argc != 2 || strcmp (argv[1], "-l")) if (argc != 2 || strcmp (argv[1], "-l"))
return 1; return 1;
#if !GLIB_CHECK_VERSION (2, 31, 0)
if (!g_thread_supported ()) if (!g_thread_supported ())
g_thread_init (NULL); g_thread_init (NULL);
#endif
my_argc = 2; my_argc = 2;
my_argv = g_malloc (my_argc * sizeof (char *)); my_argv = g_malloc (my_argc * sizeof (char *));

2
tools/gst-inspect.c
View file

@ -1561,7 +1561,9 @@ main (int argc, char *argv[])
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
#endif #endif
#if !GLIB_CHECK_VERSION (2, 31, 0)
g_thread_init (NULL); g_thread_init (NULL);
#endif
gst_tools_set_prgname ("gst-inspect"); gst_tools_set_prgname ("gst-inspect");

2
tools/gst-launch.c
View file

@ -971,7 +971,9 @@ main (int argc, char *argv[])
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
#endif #endif
#if !GLIB_CHECK_VERSION (2, 31, 0)
g_thread_init (NULL); g_thread_init (NULL);
#endif
gst_tools_set_prgname ("gst-launch"); gst_tools_set_prgname ("gst-launch");

2
tools/gst-typefind.c
View file

@ -153,7 +153,9 @@ main (int argc, char *argv[])
textdomain (GETTEXT_PACKAGE); textdomain (GETTEXT_PACKAGE);
#endif #endif
#if !GLIB_CHECK_VERSION (2, 31, 0)
g_thread_init (NULL); g_thread_init (NULL);
#endif
gst_tools_set_prgname ("gst-typefind"); gst_tools_set_prgname ("gst-typefind");

2
tools/gst-xmlinspect.c
View file

@ -641,7 +641,9 @@ main (int argc, char *argv[])
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
#if !GLIB_CHECK_VERSION (2, 31, 0)
g_thread_init (NULL); g_thread_init (NULL);
#endif
gst_tools_set_prgname ("gst-xmlinspect"); gst_tools_set_prgname ("gst-xmlinspect");