[vlc-devel] commit: MSW vout: fix compilation since [76e8da0ff] change ( Jean-Baptiste Kempf )
git version control
git at videolan.org
Sun Dec 27 01:48:01 CET 2009
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Dec 27 01:40:38 2009 +0100| [2ee365479301f4c265737367b481c3bd60480a08] | committer: Jean-Baptiste Kempf
MSW vout: fix compilation since [76e8da0ff] change
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2ee365479301f4c265737367b481c3bd60480a08
---
modules/video_output/msw/direct3d.c | 4 ++--
modules/video_output/msw/events.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index f04368d..68d26c8 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -350,13 +350,13 @@ static int ControlReopenDevice(vout_display_t *vd)
if (sys->desktop_save.is_fullscreen)
vout_display_SendEventFullscreen(vd, false);
if (sys->desktop_save.is_on_top)
- vout_display_SendEventOnTop(vd, false);
+ vout_display_SendWindowState(vd, VOUT_WINDOW_STATE_NORMAL);
} else {
/* Restore fullscreen/on_top */
if (sys->desktop_save.is_fullscreen)
vout_display_SendEventFullscreen(vd, true);
if (sys->desktop_save.is_on_top)
- vout_display_SendEventOnTop(vd, true);
+ vout_display_SendWindowState(vd, VOUT_WINDOW_STATE_ABOVE);
}
return VLC_SUCCESS;
}
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 83dc7cb..fbe539e 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -749,7 +749,8 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
{
msg_Dbg(vd, "WinProc WM_SYSCOMMAND: IDM_TOGGLE_ON_TOP");
HMENU hMenu = GetSystemMenu(vd->sys->hwnd, FALSE);
- vout_display_SendEventOnTop(vd, (GetMenuState(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND) & MF_CHECKED) == 0);
+ vout_display_SendWindowState(vd, (GetMenuState(hMenu, IDM_TOGGLE_ON_TOP, MF_BYCOMMAND) & MF_CHECKED) ?
+ VOUT_WINDOW_STATE_NORMAL : VOUT_WINDOW_STATE_ABOVE);
return 0;
}
default:
More information about the vlc-devel
mailing list