From 05eccaef907c9fca4f874b8ffa608d4815fbeebd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 12 Feb 2016 16:55:12 +0000 Subject: gtk3+wayland: implement video playback under gtk3 + wayland split the gtk2 and gtk3 gtkobjects (cherry picked from commit 31fa4545985acc1594107e087cedc2d99b3d0f0b) Change-Id: I32084232c44a12e9641010b51e75710abc827695 rename X11WindowProvider to a NativeWindowHandle provider sort of thing and genericize it (cherry picked from commit e35e762d564da18b0b508112f3e4d78fd26ba99c) Change-Id: I27e1e47f2b371e5269db079cfc1262d056105f80 implement wayland handle passing for gstreamer Change-Id: I3b0effe35ad7b37ff7ab3de2a3b78b6312779139 (cherry picked from commit c0d4f3ad3307c7a0d0fddd8c413ef0cc91d382ae) gtk3+wayland: play video via gtksink gstreamer element (cherry picked from commit 8543fbc72fafc0d71a8760752ca2ef5b7119cb5c) Change-Id: Ib371fa06eda73962cbe94739e69a68b46c26e4bf Reviewed-on: https://gerrit.libreoffice.org/22462 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- vcl/unx/generic/window/salframe.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/unx/generic/window/salframe.cxx') diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index c0e3e75e36ec..63f7c9d68cd2 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -4133,7 +4133,7 @@ void X11SalFrame::EndSetClipRegion() } -Window X11SalFrame::GetX11Window() +sal_uIntPtr X11SalFrame::GetNativeWindowHandle() { return mhWindow; } -- cgit v1.2.3