[vlc-devel] commit: VOUT_WINDOW_SET_ON_TOP -> VOUT_WINDOW_SET_STATE ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sat Dec 26 19:01:25 CET 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec 26 14:14:18 2009 +0200| [e21af72667a0291da9decea43330b881fabf8939] | committer: Rémi Denis-Courmont
VOUT_WINDOW_SET_ON_TOP -> VOUT_WINDOW_SET_STATE
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e21af72667a0291da9decea43330b881fabf8939
---
include/vlc_vout_window.h | 8 ++++----
modules/gui/qt4/main_interface.cpp | 2 +-
modules/video_output/drawable.c | 2 +-
modules/video_output/msw/common.c | 2 +-
modules/video_output/msw/common_vo.c | 2 +-
modules/video_output/xcb/glx.c | 2 +-
modules/video_output/xcb/window.c | 2 +-
modules/video_output/xcb/x11.c | 2 +-
modules/video_output/xcb/xvideo.c | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index f2e14fe..14e6db7 100644
--- 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 1390d2e..493181b 100644
--- 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 927f276..54f689c 100644
--- 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 fd92aa2..d1cf710 100644
--- 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 e63a7d1..0f0f9ec 100644
--- 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 534d0cc..b593b9b 100644
--- 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 61bf900..f46bede 100644
--- 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 a8a003e..3a3c8d0 100644
--- 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 83910a4..556c73a 100644
--- 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
More information about the vlc-devel
mailing list