[vlc-commits] commit: Win32: use video-x and video-y (fixes #3215) ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar  6 18:48:43 2010 +0200| [0b220edc8087ebffc3c124e5196b224008aada6a] | committer: Rémi Denis-Courmont 

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

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

 modules/video_output/msw/common.c   |    4 ++--
 modules/video_output/msw/direct3d.c |    4 ++--
 modules/video_output/msw/events.c   |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index d21e211..8dd2d79 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 c24fed0..dce4e03 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 8182241..b4fb0eb 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;