mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

glwindow: move main loop/context creation back to init/finalize

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=750199
This commit is contained in:
Julien Isorce 2015-06-01 12:58:11 +01:00
parent 5fe88f7ed7
commit d843b9e8c3
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst-libs/gst/gl/gstglwindow.c
View file

@ -137,13 +137,15 @@ gst_gl_window_default_open (GstGLWindow * window, GError ** error)
GstGLWindowPrivate *priv = window->priv; GstGLWindowPrivate *priv = window->priv;
if (g_main_context_get_thread_default ()) { if (g_main_context_get_thread_default ()) {
if (priv->main_context)
g_main_context_unref (priv->main_context);
if (priv->loop)
g_main_loop_unref (priv->loop);
priv->main_context = g_main_context_ref_thread_default (); priv->main_context = g_main_context_ref_thread_default ();
priv->loop = NULL; priv->loop = NULL;
priv->alive = TRUE; priv->alive = TRUE;
} else { } else {
priv->main_context = g_main_context_new ();
g_main_context_push_thread_default (priv->main_context); g_main_context_push_thread_default (priv->main_context);
priv->loop = g_main_loop_new (priv->main_context, FALSE);
} }
return TRUE; return TRUE;
@ -154,14 +156,13 @@ gst_gl_window_default_close (GstGLWindow * window)
{ {
GstGLWindowPrivate *priv = window->priv; GstGLWindowPrivate *priv = window->priv;
if (priv->loop) if (!priv->loop) {
g_main_loop_unref (priv->loop);
else
priv->alive = FALSE; priv->alive = FALSE;
g_main_context_unref (priv->main_context);
g_main_context_pop_thread_default (priv->main_context); priv->main_context = NULL;
} else {
g_main_context_unref (priv->main_context); g_main_context_pop_thread_default (priv->main_context);
}
} }
static void static void
@ -179,7 +180,8 @@ _init_debug (void)
static void static void
gst_gl_window_init (GstGLWindow * window) gst_gl_window_init (GstGLWindow * window)
{ {
window->priv = GST_GL_WINDOW_GET_PRIVATE (window); GstGLWindowPrivate *priv = GST_GL_WINDOW_GET_PRIVATE (window);
window->priv = priv;
g_mutex_init (&window->lock); g_mutex_init (&window->lock);
g_mutex_init (&window->nav_lock); g_mutex_init (&window->nav_lock);
@ -190,6 +192,9 @@ gst_gl_window_init (GstGLWindow * window)
window->is_drawing = FALSE; window->is_drawing = FALSE;
g_weak_ref_init (&window->context_ref, NULL); g_weak_ref_init (&window->context_ref, NULL);
priv->main_context = g_main_context_new ();
priv->loop = g_main_loop_new (priv->main_context, FALSE);
} }
static void static void
@ -321,6 +326,7 @@ static void
gst_gl_window_finalize (GObject * object) gst_gl_window_finalize (GObject * object)
{ {
GstGLWindow *window = GST_GL_WINDOW (object); GstGLWindow *window = GST_GL_WINDOW (object);
GstGLWindowPrivate *priv = window->priv;
if (window->nav_alive) { if (window->nav_alive) {
g_mutex_lock (&window->nav_lock); g_mutex_lock (&window->nav_lock);
@ -332,6 +338,12 @@ gst_gl_window_finalize (GObject * object)
g_mutex_unlock (&window->nav_lock); g_mutex_unlock (&window->nav_lock);
} }
if (priv->loop)
g_main_loop_unref (priv->loop);
if (priv->main_context)
g_main_context_unref (priv->main_context);
g_weak_ref_clear (&window->context_ref); g_weak_ref_clear (&window->context_ref);
g_mutex_clear (&window->lock); g_mutex_clear (&window->lock);