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

[Rémi Denis-Courmont]

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

vout: set fullscreen directly on window rather than display

(cherry picked from commit cf5332b7515b09327e535ca56685556c07925afa)

Ref #13647

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 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 1b01ee0..bc1fd6c 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1264,7 +1264,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.object;
+
+    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)