mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 11:32:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

wayland: fail window open if the display is the correct type

Browse source 
Errors out cleanly if a wayland compositor is not running
This commit is contained in:
Matthew Waters 2015-07-27 18:21:19 +10:00 committed by Tim-Philipp Müller
parent 6ccaafc0f3
commit 70184c52f0
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
View file

@ -382,9 +382,17 @@ gst_gl_window_wayland_egl_close (GstGLWindow * window)
static gboolean static gboolean
gst_gl_window_wayland_egl_open (GstGLWindow * window, GError ** error) gst_gl_window_wayland_egl_open (GstGLWindow * window, GError ** error)
{ {
GstGLDisplayWayland *display = GST_GL_DISPLAY_WAYLAND (window->display); GstGLDisplayWayland *display;
GstGLWindowWaylandEGL *window_egl = GST_GL_WINDOW_WAYLAND_EGL (window); GstGLWindowWaylandEGL *window_egl = GST_GL_WINDOW_WAYLAND_EGL (window);
if (!GST_IS_GL_DISPLAY_WAYLAND (window->display)) {
g_set_error (error, GST_GL_WINDOW_ERROR,
GST_GL_WINDOW_ERROR_RESOURCE_UNAVAILABLE,
"Failed to retrieve Wayland display (wrong type?)");
return FALSE;
}
display = GST_GL_DISPLAY_WAYLAND (window->display);
if (!display->display) { if (!display->display) {
g_set_error (error, GST_GL_WINDOW_ERROR, g_set_error (error, GST_GL_WINDOW_ERROR,
GST_GL_WINDOW_ERROR_RESOURCE_UNAVAILABLE, GST_GL_WINDOW_ERROR_RESOURCE_UNAVAILABLE,