gldisplay: Prefer wayland over X11

As most Wayland compositors supports XWayland, X11 backend get
selected. This also realign better GStreamer decision to what
happens with GTK and other stack out there.
This commit is contained in:
Nicolas Dufresne 2017-12-02 15:25:38 -05:00
parent 69934d0756
commit 472b8a3736

View file

@ -292,14 +292,14 @@ gst_gl_display_new (void)
return NULL; return NULL;
} }
#endif #endif
#if GST_GL_HAVE_WINDOW_X11
if (!display && (!user_choice || g_strstr_len (user_choice, 3, "x11")))
display = GST_GL_DISPLAY (gst_gl_display_x11_new (NULL));
#endif
#if GST_GL_HAVE_WINDOW_WAYLAND #if GST_GL_HAVE_WINDOW_WAYLAND
if (!display && (!user_choice || g_strstr_len (user_choice, 7, "wayland"))) if (!display && (!user_choice || g_strstr_len (user_choice, 7, "wayland")))
display = GST_GL_DISPLAY (gst_gl_display_wayland_new (NULL)); display = GST_GL_DISPLAY (gst_gl_display_wayland_new (NULL));
#endif #endif
#if GST_GL_HAVE_WINDOW_X11
if (!display && (!user_choice || g_strstr_len (user_choice, 3, "x11")))
display = GST_GL_DISPLAY (gst_gl_display_x11_new (NULL));
#endif
#if GST_GL_HAVE_WINDOW_VIV_FB #if GST_GL_HAVE_WINDOW_VIV_FB
if (!display && (!user_choice || g_strstr_len (user_choice, 6, "viv-fb"))) { if (!display && (!user_choice || g_strstr_len (user_choice, 6, "viv-fb"))) {
const gchar *disp_idx_str = NULL; const gchar *disp_idx_str = NULL;