mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

g_thread_create() is deprecated in GLib master, use g_thread_try_new() instead

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-12-03 13:58:51 +00:00
parent bfcb5a43a6
commit ca179625f8
4 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/gstsystemclock.c
View file

@ -735,8 +735,14 @@ gst_system_clock_start_async (GstSystemClock * clock)
if (G_LIKELY (clock->thread != NULL)) if (G_LIKELY (clock->thread != NULL))
return TRUE; /* Thread already running. Nothing to do */ return TRUE; /* Thread already running. Nothing to do */
#if !GLIB_CHECK_VERSION (2, 31, 0)
clock->thread = g_thread_create ((GThreadFunc) gst_system_clock_async_thread, clock->thread = g_thread_create ((GThreadFunc) gst_system_clock_async_thread,
clock, TRUE, &error); clock, TRUE, &error);
#else
clock->thread = g_thread_try_new ("GstSystemClock",
(GThreadFunc) gst_system_clock_async_thread, clock, &error);
#endif
if (G_UNLIKELY (error)) if (G_UNLIKELY (error))
goto no_thread; goto no_thread;

11
libs/gst/check/gstcheck.h
View file

@ -277,6 +277,17 @@ MAIN_INIT(); \
MAIN_START_THREAD_FUNCTIONS(count, function, data); \ MAIN_START_THREAD_FUNCTIONS(count, function, data); \
MAIN_SYNCHRONIZE(); MAIN_SYNCHRONIZE();
#if GLIB_CHECK_VERSION (2, 31, 0)
#define g_thread_create gst_g_thread_create
static inline GThread *
gst_g_thread_create (GThreadFunc func, gpointer data, gboolean joinable,
GError **error)
{
g_assert (joinable);
return g_thread_try_new ("gst-check", func, data, error);
}
#endif
#define MAIN_INIT() \ #define MAIN_INIT() \
G_STMT_START { \ G_STMT_START { \
_gst_check_threads_running = TRUE; \ _gst_check_threads_running = TRUE; \

8
libs/gst/net/gstnetclientclock.c
View file

@ -457,9 +457,15 @@ gst_net_client_clock_start (GstNetClientClock * self)
gst_poll_add_fd (self->priv->fdset, &self->priv->sock); gst_poll_add_fd (self->priv->fdset, &self->priv->sock);
gst_poll_fd_ctl_read (self->priv->fdset, &self->priv->sock, TRUE); gst_poll_fd_ctl_read (self->priv->fdset, &self->priv->sock, TRUE);
#if !GLIB_CHECK_VERSION (2, 31, 0)
self->thread = g_thread_create (gst_net_client_clock_thread, self, TRUE, self->thread = g_thread_create (gst_net_client_clock_thread, self, TRUE,
&error); &error);
if (!self->thread) #else
self->thread = g_thread_try_new ("GstNetClientClock",
gst_net_client_clock_thread, self, &error);
#endif
if (error != NULL)
goto no_thread; goto no_thread;
return TRUE; return TRUE;

8
libs/gst/net/gstnettimeprovider.c
View file

@ -403,9 +403,15 @@ gst_net_time_provider_start (GstNetTimeProvider * self)
gst_poll_add_fd (self->priv->fdset, &self->priv->sock); gst_poll_add_fd (self->priv->fdset, &self->priv->sock);
gst_poll_fd_ctl_read (self->priv->fdset, &self->priv->sock, TRUE); gst_poll_fd_ctl_read (self->priv->fdset, &self->priv->sock, TRUE);
#if !GLIB_CHECK_VERSION (2, 31, 0)
self->thread = g_thread_create (gst_net_time_provider_thread, self, TRUE, self->thread = g_thread_create (gst_net_time_provider_thread, self, TRUE,
&error); &error);
if (!self->thread) #else
self->thread = g_thread_try_new ("GstNetTimeProvider",
gst_net_time_provider_thread, self, &error);
#endif
if (error != NULL)
goto no_thread; goto no_thread;
return TRUE; return TRUE;