[vlc-commits] vout:win32: misc code cleaning

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Apr  1 13:10:39 2019 +0200| [1116418b126285533b75ed72913c0f4324c82b39] | committer: Steve Lhomme

vout:win32: misc code cleaning

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1116418b126285533b75ed72913c0f4324c82b39
---

 modules/video_output/win32/common.c |  1 -
 modules/video_output/win32/common.h |  2 +-
 modules/video_output/win32/events.c | 12 +++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c
index 66ff48ad96..db0b7f2319 100644
--- a/modules/video_output/win32/common.c
+++ b/modules/video_output/win32/common.c
@@ -45,7 +45,6 @@
 
 #if !VLC_WINSTORE_APP
 static void CommonChangeThumbnailClip(vlc_object_t *, vout_display_sys_win32_t *, bool show);
-static int  CommonControlSetFullscreen(vlc_object_t *, vout_display_sys_win32_t *, bool is_fullscreen);
 
 static bool GetRect(const vout_display_sys_win32_t *sys, RECT *out)
 {
diff --git a/modules/video_output/win32/common.h b/modules/video_output/win32/common.h
index 63bee758d7..31863fb115 100644
--- a/modules/video_output/win32/common.h
+++ b/modules/video_output/win32/common.h
@@ -94,4 +94,4 @@ void UpdateRects (vout_display_t *, vout_display_sys_win32_t *, bool is_forced);
 /*****************************************************************************
  * Constants
  *****************************************************************************/
-#define IDM_TOGGLE_ON_TOP WM_USER + 1
+#define IDM_TOGGLE_ON_TOP  (WM_USER + 1)
diff --git a/modules/video_output/win32/events.c b/modules/video_output/win32/events.c
index 087f4bc958..74e9ed3dac 100644
--- a/modules/video_output/win32/events.c
+++ b/modules/video_output/win32/events.c
@@ -158,8 +158,8 @@ static void *EventThread( void *p_this )
     POINT old_mouse_pos = {0,0}, mouse_pos;
     int canc = vlc_savecancel ();
 
-    bool b_mouse_support = var_InheritBool( p_event->vd, "mouse-events" );
-    bool b_key_support = var_InheritBool( p_event->vd, "keyboard-events" );
+    bool b_mouse_support = var_InheritBool( vd, "mouse-events" );
+    bool b_key_support = var_InheritBool( vd, "keyboard-events" );
 
     vlc_mutex_lock( &p_event->lock );
     /* Create a window for the video */
@@ -208,8 +208,7 @@ static void *EventThread( void *p_this )
             continue;
 
         /* Handle mouse state */
-        if( msg.message == WM_MOUSEMOVE ||
-            msg.message == WM_NCMOUSEMOVE )
+        if( msg.message == WM_MOUSEMOVE || msg.message == WM_NCMOUSEMOVE )
         {
             GetCursorPos( &mouse_pos );
             /* FIXME, why this >2 limits ? */
@@ -464,9 +463,9 @@ event_thread_t *EventThreadCreate( vout_display_t *vd, const vout_display_cfg_t
     atomic_init(&p_event->has_moved, false);
     vout_display_PlacePicture(&p_event->place, &vd->source, vdcfg);
 
-    _sntprintf( p_event->class_main, sizeof(p_event->class_main)/sizeof(*p_event->class_main),
+    _sntprintf( p_event->class_main, ARRAYSIZE(p_event->class_main),
                _T("VLC video main %p"), (void *)p_event );
-    _sntprintf( p_event->class_video, sizeof(p_event->class_video)/sizeof(*p_event->class_video),
+    _sntprintf( p_event->class_video, ARRAYSIZE(p_event->class_video),
                _T("VLC video output %p"), (void *)p_event );
     return p_event;
 }
@@ -995,7 +994,6 @@ static long FAR PASCAL WinVoutEventProc( HWND hwnd, UINT message,
         return DecodeGesture( VLC_OBJECT(vd), p_event->p_gesture, hwnd, message, wParam, lParam );
 
     default:
-        //msg_Dbg( vd, "WinProc WM Default %i", message );
         break;
     }