vout: eliminate dead window state code

diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index 408a0b8b77668f1e48091125b6d1937eb25851a7..ab44621dec6ed83498b338411b0cfcee87684dec 100644 (file)
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -367,11 +367,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
         const vout_display_cfg_t *c = va_arg(ap, const vout_display_cfg_t *);
         return vout_window_SetFullScreen(sys->embed, c->is_fullscreen);
     }
-    case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
-    {
-        unsigned state = va_arg(ap, unsigned);
-        return vout_window_SetState(sys->embed, state);
-    }
     case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
     {
         const vout_display_cfg_t *cfg = va_arg(ap, const vout_display_cfg_t *);

diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 74290b898c42a9e4eb699257b63c86c50926871c..39ddae316180a03ea7a12ff51cae8254187e79b6 100644 (file)
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -251,13 +251,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         return vout_window_SetFullScreen (sys->gl->surface, c->is_fullscreen);
       }
 
-      case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
-      {
-        unsigned state = va_arg (ap, unsigned);
-
-        return vout_window_SetState (sys->gl->surface, state);
-      }
-
       case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
       case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
       case VOUT_DISPLAY_CHANGE_ZOOM:

diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c
index 4803088807e7a7b85664ee1ec36bdec1ca5f1480..d8b9cc1aaf49455736645d28befc266e998125d4 100644 (file)
--- a/modules/video_output/kva.c
+++ b/modules/video_output/kva.c
@@ -463,12 +463,7 @@ static int Control( vout_display_t *vd, int query, va_list args )
         const unsigned state = va_arg( args, unsigned );
         const bool is_on_top = (state & VOUT_WINDOW_STATE_ABOVE) != 0;
 
-        if( sys->parent_window )
-        {
-            if( vout_window_SetState( sys->parent_window, state ))
-                return VLC_EGENERIC;
-        }
-        else if( is_on_top )
+        if( is_on_top )
             WinSetWindowPos( sys->frame, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
 
         sys->is_on_top = is_on_top;

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index a4b5f2fae38632f0b8d3c140f72f84df2a4769c9..a74f26983e611e46df708417ce2584510478773a 100644 (file)
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -330,11 +330,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
 
             return VLC_SUCCESS;
         }
-        case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
-        {
-            unsigned state = va_arg (ap, unsigned);
-            return vout_window_SetState (sys->embed, state);
-        }
         case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
         case VOUT_DISPLAY_CHANGE_ZOOM:
         case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:

diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index 5d22689aae9cc827381c282a7304e088836a6449..cd5c0e5804e8582d113f80bc74e1d081c984d49a 100644 (file)
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -595,19 +595,14 @@ int CommonControl(vout_display_t *vd, int query, va_list args)
         if (sys->use_desktop && is_on_top)
             return VLC_EGENERIC;
 #endif
-        if (sys->parent_window) {
-            if (vout_window_SetState(sys->parent_window, state))
-                return VLC_EGENERIC;
-        } else {
-            HMENU hMenu = GetSystemMenu(sys->hwnd, FALSE);
-
-            if (is_on_top && !(GetWindowLong(sys->hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) {
-                CheckMenuItem(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND | MFS_CHECKED);
-                SetWindowPos(sys->hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
-            } else if (!is_on_top && (GetWindowLong(sys->hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) {
-                CheckMenuItem(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND | MFS_UNCHECKED);
-                SetWindowPos(sys->hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE);
-            }
+        HMENU hMenu = GetSystemMenu(sys->hwnd, FALSE);
+
+        if (is_on_top && !(GetWindowLong(sys->hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) {
+            CheckMenuItem(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND | MFS_CHECKED);
+            SetWindowPos(sys->hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
+        } else if (!is_on_top && (GetWindowLong(sys->hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) {
+            CheckMenuItem(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND | MFS_UNCHECKED);
+            SetWindowPos(sys->hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE);
         }
         sys->is_on_top = is_on_top;
         return VLC_SUCCESS;

diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c
index 380a881937316c0fd9eea0825b5daea8456fbace..42a0840fdb87843cb16d5f9adf4bf1d886b59b83 100644 (file)
--- a/modules/video_output/wayland/shm.c
+++ b/modules/video_output/wayland/shm.c
@@ -278,12 +278,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
             return vout_window_SetFullScreen(sys->embed, cfg->is_fullscreen);
         }
 
-        case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
-        {
-            unsigned state = va_arg(ap, unsigned);
-            return vout_window_SetState(sys->embed, state);
-        }
-
         case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
         case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
         case VOUT_DISPLAY_CHANGE_ZOOM:

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 7a3c5116ebaa9490371eb443f04b932c9fd97556..31659494d144e66ac1e2abb5a3f5d9a93d26e351 100644 (file)
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -221,12 +221,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         return vout_window_SetFullScreen (sys->gl->surface, c->is_fullscreen);
     }
 
-    case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
-    {
-        unsigned state = va_arg (ap, unsigned);
-        return vout_window_SetState (sys->gl->surface, state);
-    }
-
     case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
     case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
     case VOUT_DISPLAY_CHANGE_ZOOM:

diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 4316980ec3bf014ed71dc4cc555785b6d35d2eac..7086d00c6a3b9809e6ab544e298b76151252f733 100644 (file)
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -495,11 +495,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
                               values);
         return VLC_SUCCESS;
     }
-    case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
-    {
-        unsigned state = va_arg (ap, unsigned);
-        return vout_window_SetState (sys->embed, state);
-    }
 
     case VOUT_DISPLAY_CHANGE_ZOOM:
     case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 325e22432de32f2145ed478f7b0984e7dcbe215a..f820e7439e2199e5023416c691b30dd5baf060e3 100644 (file)
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -788,11 +788,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         xcb_flush (p_sys->conn);
         return VLC_SUCCESS;
     }
-    case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
-    {
-        unsigned state = va_arg (ap, unsigned);
-        return vout_window_SetState (p_sys->embed, state);
-    }
 
     /* Hide the mouse. It will be send when
      * vout_display_t::info.b_hide_mouse is false */