From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 6 Mar 2010 16:48:43 +0000 (+0200)
Subject: Win32: use video-x and video-y (fixes #3215)
X-Git-Tag: 1.1.0-pre1~470
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0b220edc8087ebffc3c124e5196b224008aada6a;p=vlc

Win32: use video-x and video-y (fixes #3215)
---

diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index d21e211ea1..8dd2d79f06 100644
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -100,8 +100,8 @@ int CommonInit(vout_display_t *vd)
     cfg.use_overlay = sys->use_overlay;
 #endif
     cfg.win.type   = VOUT_WINDOW_TYPE_HWND;
-    cfg.win.x      = 0;
-    cfg.win.y      = 0;
+    cfg.win.x      = var_InheritInteger(vd, "video-x");
+    cfg.win.y      = var_InheritInteger(vd, "video-y");
     cfg.win.width  = vd->cfg->display.width;
     cfg.win.height = vd->cfg->display.height;
 
diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index c24fed0798..dce4e039dc 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -144,9 +144,9 @@ static int Open(vlc_object_t *object)
     sys->allow_hw_yuv = var_CreateGetBool(vd, "directx-hw-yuv");
     sys->desktop_save.is_fullscreen = vd->cfg->is_fullscreen;
     sys->desktop_save.is_on_top     = false;
-    sys->desktop_save.win.left      = 0;
+    sys->desktop_save.win.left      = var_InheritInteger(vd, "video-x");
     sys->desktop_save.win.right     = vd->cfg->display.width;
-    sys->desktop_save.win.top       = 0;
+    sys->desktop_save.win.top       = var_InheritInteger(vd, "video-y");
     sys->desktop_save.win.bottom    = vd->cfg->display.height;
 
     if (CommonInit(vd))
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 81822418e0..b4fb0eb212 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -507,8 +507,8 @@ static int DirectXCreateWindow( event_thread_t *p_event )
      * have. Unfortunatly these dimensions will include the borders and
      * titlebar. We use the following function to find out the size of
      * the window corresponding to the useable surface we want */
-    rect_window.top    = 10;
     rect_window.left   = 10;
+    rect_window.top    = 10;
     rect_window.right  = rect_window.left + p_event->wnd_cfg.width;
     rect_window.bottom = rect_window.top  + p_event->wnd_cfg.height;