[vlc-devel] commit: Pass full window state to window providers ( 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 19:50:19 2009 +0200| [36558eb52ea617c0c6293dc0974bc41df3fca1ba] | committer: Rémi Denis-Courmont
Pass full window state to window providers
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=36558eb52ea617c0c6293dc0974bc41df3fca1ba
---
modules/video_output/msw/common.c | 2 +-
modules/video_output/xcb/glx.c | 3 +--
modules/video_output/xcb/x11.c | 3 +--
modules/video_output/xcb/xvideo.c | 3 +--
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index a534db0..cc392ce 100644
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -614,7 +614,7 @@ int CommonControl(vout_display_t *vd, int query, va_list args)
return VLC_EGENERIC;
#endif
if (sys->parent_window) {
- if (vout_window_SetState(sys->parent_window, is_on_top))
+ if (vout_window_SetState(sys->parent_window, state))
return VLC_EGENERIC;
} else {
HMENU hMenu = GetSystemMenu(sys->hwnd, FALSE);
diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 5c7d524..49b45b3 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -471,8 +471,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
{
unsigned state = va_arg (ap, unsigned);
- bool b_on_top = (state & VOUT_WINDOW_STATE_ABOVE) != 0;
- return vout_window_SetState (sys->embed, b_on_top);
+ return vout_window_SetState (sys->embed, state);
}
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 7fc02da..bb9a33e 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -469,8 +469,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
{
unsigned state = va_arg (ap, unsigned);
- bool b_on_top = (state & VOUT_WINDOW_STATE_ABOVE) != 0;
- return vout_window_SetState (p_sys->embed, b_on_top);
+ return vout_window_SetState (p_sys->embed, state);
}
case VOUT_DISPLAY_CHANGE_ZOOM:
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 0cd0576..a017182 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -739,8 +739,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
{
unsigned state = va_arg (ap, unsigned);
- bool b_on_top = (state & VOUT_WINDOW_STATE_ABOVE) != 0;
- return vout_window_SetState (p_sys->embed, b_on_top);
+ return vout_window_SetState (p_sys->embed, state);
}
/* Hide the mouse. It will be send when
More information about the vlc-devel
mailing list