diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-05-23 17:09:51 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-27 10:27:02 +0200 |
commit | 9d18bc40416b651340804f44ba5fae65f3bbbcfa (patch) | |
tree | 30fda9ba61854d5e5e0036dd1f883b911cf7b9ad /vcl/unx/gtk3/gtk3gtkframe.cxx | |
parent | b1501d65674a74481b61a10a250febed77348f4a (diff) |
tdf#125271 under wayland without gtksink, try waylandsink
and if there is no videosink then give up
Change-Id: I6b60e7be1e77dbf5c4c277ccf47a4d121f3cd6a5
Reviewed-on: https://gerrit.libreoffice.org/72871
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/gtk3/gtk3gtkframe.cxx')
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index d16db67057e5..27d186923b6f 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -961,6 +961,14 @@ void GtkSalFrame::InitCommon() { m_aSystemData.pDisplay = gdk_x11_display_get_xdisplay(pDisplay); m_aSystemData.pVisual = gdk_x11_visual_get_xvisual(pVisual); + m_aSystemData.pPlatformName = "xcb"; + } +#endif +#if defined(GDK_WINDOWING_WAYLAND) + if (DLSYM_GDK_IS_WAYLAND_DISPLAY(pDisplay)) + { + m_aSystemData.pDisplay = gdk_wayland_display_get_wl_display(pDisplay); + m_aSystemData.pPlatformName = "wayland"; } #endif |