[vlc-commits] display: remove useless "window fullscreen" parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri May 18 23:28:18 2018 +0300| [a31ac0a3cf2202a04f6eef18463166fe120e1c6c] | committer: Rémi Denis-Courmont

display: remove useless "window fullscreen" parameter

The only effect of the event when the window flag is true is to update
the fullscreen flag in display configuration. And that flag is unused
when the display is windowed.

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

 include/vlc_vout_display.h             | 5 ++---
 modules/video_output/win32/common.c    | 2 +-
 modules/video_output/win32/direct3d9.c | 6 +++---
 src/video_output/display.c             | 8 ++------
 src/video_output/video_output.c        | 6 ------
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index f0bac81f22..1d7670fe1e 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -332,10 +332,9 @@ static inline void vout_display_SendEventKey(vout_display_t *vd, int key)
     vout_window_ReportKeyPress(vd->cfg->window, key);
 }
 
-static inline void vout_display_SendEventFullscreen(vout_display_t *vd, bool is_fullscreen,
-                                                    bool is_window_fullscreen)
+static inline void vout_display_SendEventFullscreen(vout_display_t *vd, bool is_fullscreen)
 {
-    vout_display_SendEvent(vd, VOUT_DISPLAY_EVENT_FULLSCREEN, is_fullscreen, is_window_fullscreen);
+    vout_display_SendEvent(vd, VOUT_DISPLAY_EVENT_FULLSCREEN, is_fullscreen);
 }
 
 VLC_DEPRECATED /* Core needs not know about this. Don't call. */
diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c
index 611554f9bc..0d076ef487 100644
--- a/modules/video_output/win32/common.c
+++ b/modules/video_output/win32/common.c
@@ -109,7 +109,7 @@ int CommonInit(vout_display_t *vd)
 
     if (vd->cfg->is_fullscreen) {
         if (CommonControlSetFullscreen(vd, true))
-            vout_display_SendEventFullscreen(vd, false, false);
+            vout_display_SendEventFullscreen(vd, false);
     }
 
 #endif
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index 2f8184a0ca..6dbc70afdb 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -333,7 +333,7 @@ static int Open(vlc_object_t *object)
 
     /* Fix state in case of desktop mode */
     if (sys->sys.use_desktop && vd->cfg->is_fullscreen)
-        vout_display_SendEventFullscreen(vd, false, false);
+        vout_display_SendEventFullscreen(vd, false);
 
     return VLC_SUCCESS;
 error:
@@ -669,13 +669,13 @@ static int ControlReopenDevice(vout_display_t *vd)
     if (sys->sys.use_desktop) {
         /* Disable fullscreen/on_top while using desktop */
         if (sys->desktop_save.is_fullscreen)
-            vout_display_SendEventFullscreen(vd, false, false);
+            vout_display_SendEventFullscreen(vd, false);
         if (sys->desktop_save.is_on_top)
             vout_display_SendWindowState(vd, VOUT_WINDOW_STATE_NORMAL);
     } else {
         /* Restore fullscreen/on_top */
         if (sys->desktop_save.is_fullscreen)
-            vout_display_SendEventFullscreen(vd, true, false);
+            vout_display_SendEventFullscreen(vd, true);
         if (sys->desktop_save.is_on_top)
             vout_display_SendWindowState(vd, VOUT_WINDOW_STATE_ABOVE);
     }
diff --git a/src/video_output/display.c b/src/video_output/display.c
index eff31b75c5..c4db6a99c8 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -342,7 +342,6 @@ typedef struct {
     unsigned height_saved;
     bool ch_fullscreen;
     bool is_fullscreen;
-    bool window_fullscreen;
     bool ch_wm_state;
     unsigned wm_state;
 #endif
@@ -559,7 +558,6 @@ static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args)
 #if defined(_WIN32) || defined(__OS2__)
     case VOUT_DISPLAY_EVENT_FULLSCREEN: {
         const int is_fullscreen = (int)va_arg(args, int);
-        const bool window_fullscreen = va_arg(args, int);
 
         msg_Dbg(vd, "VoutDisplayEvent 'fullscreen' %d", is_fullscreen);
 
@@ -567,7 +565,6 @@ static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args)
         if (!is_fullscreen != !osys->is_fullscreen) {
             osys->ch_fullscreen = true;
             osys->is_fullscreen = is_fullscreen;
-            osys->window_fullscreen = window_fullscreen;
         }
         vlc_mutex_unlock(&osys->lock);
         break;
@@ -690,12 +687,11 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
         /* */
 #if defined(_WIN32) || defined(__OS2__)
         if (ch_fullscreen) {
-            if (osys->window_fullscreen
-             || vout_display_Control(vd, VOUT_DISPLAY_CHANGE_FULLSCREEN,
+            if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_FULLSCREEN,
                                      is_fullscreen) == VLC_SUCCESS) {
                 osys->cfg.is_fullscreen = is_fullscreen;
 
-                if (!is_fullscreen && !osys->window_fullscreen)
+                if (!is_fullscreen)
                     vout_SetDisplayWindowSize(osys->vout, osys->width_saved,
                                               osys->height_saved);
             } else
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 36a4b0a193..01a352a331 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1346,12 +1346,6 @@ static void ThreadChangeFullscreen(vout_thread_t *vout, bool fullscreen)
         return; /* splitter! */
 
     vout_window_SetFullScreen(window, fullscreen);
-#if defined(_WIN32) || defined(__OS2__)
-    /* FIXME: remove this event */
-    if (vout->p->display.vd != NULL)
-        vout_display_SendEventFullscreen(vout->p->display.vd, fullscreen,
-                                         true);
-#endif
 }
 
 static void ThreadChangeWindowState(vout_thread_t *vout, unsigned state)