VOUT_WINDOW_SET_ON_TOP -> VOUT_WINDOW_SET_STATE

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index f2e14fe7a558beac02dc4f4328820552ea8df4ea..14e6db7c669aaad6bef36e6e74b739624b743881 100644 (file)
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -49,7 +49,7 @@ enum {
  * Control query for vout_window_t
  */
 enum {
-    VOUT_WINDOW_SET_ON_TOP, /* int b_on_top */
+    VOUT_WINDOW_SET_STATE, /* unsigned state */
     VOUT_WINDOW_SET_SIZE,   /* unsigned i_width, unsigned i_height */
     VOUT_WINDOW_SET_FULLSCREEN, /* int b_fullscreen */
 };
@@ -134,11 +134,11 @@ VLC_EXPORT( void, vout_window_Delete, (vout_window_t *) );
 VLC_EXPORT( int, vout_window_Control, (vout_window_t *, int query, ...) );
 
 /**
- * Configure the "On Top" properties of a windows.
+ * Configure the window management state of a windows.
  */
-static inline int vout_window_SetOnTop(vout_window_t *window, bool is_on_top)
+static inline int vout_window_SetState(vout_window_t *window, unsigned state)
 {
-    return vout_window_Control(window, VOUT_WINDOW_SET_ON_TOP, is_on_top);
+    return vout_window_Control(window, VOUT_WINDOW_SET_STATE, state);
 }
 
 /**

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 1390d2edbdc4c05867f48e9c90bb7b07a19ae517..493181b394c455e814b4987eb0c1c3e907c92333 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -892,7 +892,7 @@ int MainInterface::controlVideo( int i_query, va_list args )
         emit askUpdate();
         return VLC_EGENERIC;
     }
-    case VOUT_WINDOW_SET_ON_TOP:
+    case VOUT_WINDOW_SET_STATE:
     {
         int i_arg = va_arg( args, int );
         QApplication::postEvent( this, new SetVideoOnTopQtEvent( i_arg ) );

diff --git a/modules/video_output/drawable.c b/modules/video_output/drawable.c
index 927f2762922b446eb1938e1366c22a1fcf387fd2..54f689cb8913da1b813066c05cd1aef38e23d720 100644 (file)
--- a/modules/video_output/drawable.c
+++ b/modules/video_output/drawable.c
@@ -147,7 +147,7 @@ static int Control (vout_window_t *wnd, int query, va_list ap)
     switch (query)
     {
         case VOUT_WINDOW_SET_SIZE:   /* not allowed */
-        case VOUT_WINDOW_SET_ON_TOP: /* not allowed either, would be ugly */
+        case VOUT_WINDOW_SET_STATE: /* not allowed either, would be ugly */
             return VLC_EGENERIC;
         default:
             msg_Warn (wnd, "unsupported control query %d", query);

diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index fd92aa2e28bb833fb56b5fc7a6fdf6ec6aa261fa..d1cf7100fe5980765e6ae7c75d2751bbba7e6cc5 100644 (file)
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -613,7 +613,7 @@ int CommonControl(vout_display_t *vd, int query, va_list args)
             return VLC_EGENERIC;
 #endif
         if (sys->parent_window) {
-            if (vout_window_SetOnTop(sys->parent_window, is_on_top))
+            if (vout_window_SetState(sys->parent_window, is_on_top))
                 return VLC_EGENERIC;
         } else {
             HMENU hMenu = GetSystemMenu(sys->hwnd, FALSE);

diff --git a/modules/video_output/msw/common_vo.c b/modules/video_output/msw/common_vo.c
index e63a7d13c689bc10bf37b33fc8124eb4da06f0c4..0f0f9ec45f601abe49cce0d7b3817e28585b83dc 100644 (file)
--- a/modules/video_output/msw/common_vo.c
+++ b/modules/video_output/msw/common_vo.c
@@ -564,7 +564,7 @@ static int vaControlParentWindow( vout_thread_t *p_vout, int i_query,
     case VOUT_SET_STAY_ON_TOP:
     {
         const bool is_on_top = va_arg(args, int);
-        return vout_window_SetOnTop( p_vout->p_sys->parent_window, is_on_top );
+        return vout_window_SetState( p_vout->p_sys->parent_window, is_on_top );
     }
     default:
         return VLC_EGENERIC;

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 534d0ccca94dd1d00e74889772ba699890b1fd3f..b593b9b546d81bd77534937bba2f6895bf4b80f4 100644 (file)
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -471,7 +471,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
     case VOUT_DISPLAY_CHANGE_ON_TOP:
     {
         int b_on_top = (int)va_arg (ap, int);
-        return vout_window_SetOnTop (sys->embed, b_on_top);
+        return vout_window_SetState (sys->embed, b_on_top);
     }
 
     case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:

diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 61bf9008a4c53021652d8791a92d6dd4f9f9e4c8..f46beded7b13ddb2d92c10d6c46eac024396afde 100644 (file)
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -478,7 +478,7 @@ static int Control (vout_window_t *wnd, int cmd, va_list ap)
             break;
         }
 
-        case VOUT_WINDOW_SET_ON_TOP:
+        case VOUT_WINDOW_SET_STATE:
             set_wm_state (wnd, va_arg (ap, int), p_sys->wm_state_above);
             break;
 

diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index a8a003e1b4f2defa92fe37fc6eb26a7c887f4408..3a3c8d028a870c4c34df3d50158e73c9274809d4 100644 (file)
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -469,7 +469,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
     case VOUT_DISPLAY_CHANGE_ON_TOP:
     {
         int b_on_top = (int)va_arg (ap, int);
-        return vout_window_SetOnTop (p_sys->embed, b_on_top);
+        return vout_window_SetState (p_sys->embed, b_on_top);
     }
 
     case VOUT_DISPLAY_CHANGE_ZOOM:

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 83910a46a4cbeca40a7c973be9085205cbac64e2..556c73ad55f94f47829306cec2b37a827cfd161d 100644 (file)
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -739,7 +739,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
     case VOUT_DISPLAY_CHANGE_ON_TOP:
     {
         int on_top = (int)va_arg (ap, int);
-        return vout_window_SetOnTop (p_sys->embed, on_top);
+        return vout_window_SetState (p_sys->embed, on_top);
     }
 
     /* Hide the mouse. It will be send when