summaryrefslogtreecommitdiff
path: root/ext/gtk
diff options
context:
space:
mode:
authorJulien Isorce <j.isorce@samsung.com>2015-07-21 11:23:21 +0100
committerJulien Isorce <j.isorce@samsung.com>2015-07-21 15:06:34 +0100
commit6125ea7e9778f52cf36f5a797bf6429c7a61a4da (patch)
treed9aee3c4b1fda5d37041c02ea86f4d84b596e16e /ext/gtk
parent5457e55f255518d679b59a170951e299ecd8c5f6 (diff)
downloadgstreamer-plugins-bad-6125ea7e9778f52cf36f5a797bf6429c7a61a4da.tar.gz
gstglwidget: use gst_gl_display_create_context
Also handle the failure case. https://bugzilla.gnome.org/show_bug.cgi?id=750310
Diffstat (limited to 'ext/gtk')
-rw-r--r--ext/gtk/gtkgstglwidget.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/gtk/gtkgstglwidget.c b/ext/gtk/gtkgstglwidget.c
index f8b8d267e..378632cb0 100644
--- a/ext/gtk/gtkgstglwidget.c
+++ b/ext/gtk/gtkgstglwidget.c
@@ -530,6 +530,7 @@ gboolean
gtk_gst_gl_widget_init_winsys (GtkGstGLWidget * gst_widget)
{
GtkGstGLWidgetPrivate *priv = gst_widget->priv;
+ GError *error = NULL;
g_return_val_if_fail (GTK_IS_GST_GL_WIDGET (gst_widget), FALSE);
@@ -551,15 +552,13 @@ gtk_gst_gl_widget_init_winsys (GtkGstGLWidget * gst_widget)
return FALSE;
}
- priv->context = gst_gl_context_new (priv->display);
-
- if (!priv->context) {
+ if (!gst_gl_display_create_context (priv->display, priv->other_context,
+ &priv->context, &error)) {
+ g_clear_error (&error);
GTK_GST_BASE_WIDGET_UNLOCK (gst_widget);
return FALSE;
}
- gst_gl_context_create (priv->context, priv->other_context, NULL);
-
GTK_GST_BASE_WIDGET_UNLOCK (gst_widget);
return TRUE;
}