[vlc-devel] commit: Cleaned up a bit (msw). (Laurent Aimar )
git version control
git at videolan.org
Thu Oct 1 22:03:30 CEST 2009
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Oct 1 21:49:15 2009 +0200| [8bf2fad668c18880fa87bbb7323b7d7c16f6ed0e] | committer: Laurent Aimar
Cleaned up a bit (msw).
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8bf2fad668c18880fa87bbb7323b7d7c16f6ed0e
---
modules/video_output/msw/common.c | 2 +-
modules/video_output/msw/events.c | 8 ++++++++
modules/video_output/msw/events.h | 1 +
modules/video_output/msw/vout.h | 3 ---
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index 5438d12..262d196 100644
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -701,7 +701,7 @@ void Win32ToggleFullscreen( vout_thread_t *p_vout )
}
/* Make sure the mouse cursor is displayed */
- PostMessage( p_vout->p_sys->hwnd, WM_VLC_SHOW_MOUSE, 0, 0 );
+ EventThreadMouseShow( p_vout->p_sys->p_event );
}
/* Update the object variable and trigger callback */
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 4436dca..44867ab 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -76,6 +76,10 @@
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
+#define WM_VLC_HIDE_MOUSE (WM_APP + 0)
+#define WM_VLC_SHOW_MOUSE (WM_APP + 1)
+#define WM_VLC_CHANGE_TEXT (WM_APP + 2)
+
struct event_thread_t
{
vout_thread_t *p_vout;
@@ -933,6 +937,10 @@ void EventThreadMouseAutoHide( event_thread_t *p_event )
}
}
}
+void EventThreadMouseShow( event_thread_t *p_event )
+{
+ PostMessage( p_event->hwnd, WM_VLC_SHOW_MOUSE, 0, 0 );
+}
void EventThreadUpdateTitle( event_thread_t *p_event, const char *psz_fallback )
{
char *psz_title = var_GetNonEmptyString( p_event->p_vout, "video-title" );
diff --git a/modules/video_output/msw/events.h b/modules/video_output/msw/events.h
index bbd57e3..5e5204d 100644
--- a/modules/video_output/msw/events.h
+++ b/modules/video_output/msw/events.h
@@ -48,6 +48,7 @@ int EventThreadStart( event_thread_t *, event_hwnd_t *, const event_
void EventThreadStop( event_thread_t * );
void EventThreadMouseAutoHide( event_thread_t * );
+void EventThreadMouseShow( event_thread_t * );
void EventThreadUpdateTitle( event_thread_t *, const char *psz_fallback );
unsigned EventThreadRetreiveChanges( event_thread_t * );
int EventThreadGetWindowStyle( event_thread_t * );
diff --git a/modules/video_output/msw/vout.h b/modules/video_output/msw/vout.h
index 93de50c..9dc3487 100644
--- a/modules/video_output/msw/vout.h
+++ b/modules/video_output/msw/vout.h
@@ -250,9 +250,6 @@ void RestoreScreensaver ( vout_thread_t *p_vout );
/*****************************************************************************
* Constants
*****************************************************************************/
-#define WM_VLC_HIDE_MOUSE WM_APP
-#define WM_VLC_SHOW_MOUSE WM_APP + 1
-#define WM_VLC_CHANGE_TEXT WM_APP + 2
#define IDM_TOGGLE_ON_TOP WM_USER + 1
#define DX_POSITION_CHANGE 0x1000
#define DX_WALLPAPER_CHANGE 0x2000
More information about the vlc-devel
mailing list