From: Laurent Aimar <fenrir@videolan.org>
Date: Thu, 1 Oct 2009 19:49:15 +0000 (+0200)
Subject: Cleaned up a bit (msw).
X-Git-Tag: 1.1.0-ff~3086
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8bf2fad668c18880fa87bbb7323b7d7c16f6ed0e;p=vlc

Cleaned up a bit (msw).
---

diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index 5438d1299f..262d196e34 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 4436dcad05..44867abbae 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 bbd57e3049..5e5204d3ef 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 93de50c420..9dc348785e 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