[vlc-commits] vout: set fullscreen directly on window rather than display

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 12 19:37:59 2014 +0300| [cf5332b7515b09327e535ca56685556c07925afa] | committer: Rémi Denis-Courmont

vout: set fullscreen directly on window rather than display

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cf5332b7515b09327e535ca56685556c07925afa
---

 src/video_output/video_output.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index b73ddd8..0888fb3 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1260,7 +1260,14 @@ static void ThreadStep(vout_thread_t *vout, mtime_t *duration)
 
 static void ThreadChangeFullscreen(vout_thread_t *vout, bool fullscreen)
 {
-    vout_SetDisplayFullscreen(vout->p->display.vd, fullscreen);
+    vout_window_t *window = vout->p->window;
+
+    if (window != NULL)
+        vout_window_SetFullScreen(window, fullscreen);
+    else
+    if (vout->p->display.vd != NULL)
+        vout_display_SendEvent(vout->p->display.vd,
+                               VOUT_DISPLAY_EVENT_FULLSCREEN, fullscreen);
 }
 
 static void ThreadChangeWindowState(vout_thread_t *vout, unsigned state)