[vlc-commits] vout:win32: set the gesture/projected mode early

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Mar 26 15:55:55 2019 +0100| [04d05e79952d2b476e69f3a1e1a555b66e6431d7] | committer: Steve Lhomme

vout:win32: set the gesture/projected mode early

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

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

diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c
index c5077df604..ef634e0f7e 100644
--- a/modules/video_output/win32/common.c
+++ b/modules/video_output/win32/common.c
@@ -118,6 +118,7 @@ int CommonInit(vout_display_t *vd, display_win32_area_t *area, vout_display_sys_
     cfg.y      = var_InheritInteger(vd, "video-y");
     cfg.width  = area->vdcfg.display.width;
     cfg.height = area->vdcfg.display.height;
+    cfg.is_projected = vd->source.projection_mode != PROJECTION_MODE_RECTANGULAR;
 
     event_hwnd_t hwnd;
     if (EventThreadStart(sys->event, &hwnd, &cfg))
diff --git a/modules/video_output/win32/events.c b/modules/video_output/win32/events.c
index f431cb0bc9..f65c0c1c88 100644
--- a/modules/video_output/win32/events.c
+++ b/modules/video_output/win32/events.c
@@ -61,6 +61,7 @@ struct event_thread_t
 
     /* */
     bool use_desktop;
+    bool is_projected;
 
     /* Mouse */
     bool is_cursor_hidden;
@@ -477,6 +478,7 @@ void EventThreadDestroy( event_thread_t *p_event )
 int EventThreadStart( event_thread_t *p_event, event_hwnd_t *p_hwnd, const event_cfg_t *p_cfg )
 {
     p_event->use_desktop = p_cfg->use_desktop;
+    p_event->is_projected = p_cfg->is_projected;
     p_event->window_area.left   = p_cfg->x;
     p_event->window_area.top    = p_cfg->y;
     p_event->window_area.right  = p_cfg->x + p_cfg->width;
@@ -821,8 +823,7 @@ static int Win32VoutCreateWindow( event_thread_t *p_event )
     }
     msg_Dbg( vd, "created video sub-window" );
 
-    bool b_isProjected  = (vd->fmt.projection_mode != PROJECTION_MODE_RECTANGULAR);
-    InitGestures( p_event->hwnd, &p_event->p_gesture, b_isProjected );
+    InitGestures( p_event->hwnd, &p_event->p_gesture, p_event->is_projected );
 
     /* Now display the window */
     ShowWindow( p_event->hwnd, SW_SHOW );
diff --git a/modules/video_output/win32/events.h b/modules/video_output/win32/events.h
index 1149b1f5d4..c4e18593e1 100644
--- a/modules/video_output/win32/events.h
+++ b/modules/video_output/win32/events.h
@@ -31,6 +31,7 @@ typedef struct event_thread_t event_thread_t;
 
 typedef struct {
     bool use_desktop; /* direct3d */
+    bool is_projected;
     int x;
     int y;
     unsigned width;