[vlc-devel] commit: Cosmetics (msw). (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Jan  3 22:08:26 2010 +0100| [e36b4e6a4e1883f5a18abc60f1c4cd98b4c2ed7c] | committer: Laurent Aimar 

Cosmetics (msw).

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

 modules/video_output/msw/common.h   |   13 ++++++-------
 modules/video_output/msw/direct3d.c |    1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/video_output/msw/common.h b/modules/video_output/msw/common.h
index 259c699..5372f0a 100644
--- a/modules/video_output/msw/common.h
+++ b/modules/video_output/msw/common.h
@@ -80,13 +80,6 @@ struct vout_display_sys_t
     HWND                 hparent;             /* Handle of the parent window */
     HWND                 hfswnd;          /* Handle of the fullscreen window */
 
-    /* Multi-monitor support
-     * TODO move to directx only */
-    HMONITOR             hmonitor;          /* handle of the current monitor */
-    GUID                 *display_driver;
-    HMONITOR             (WINAPI* MonitorFromWindow)(HWND, DWORD);
-    BOOL                 (WINAPI* GetMonitorInfo)(HMONITOR, LPMONITORINFO);
-
     /* size of the display */
     RECT         rect_display;
     int          display_depth;
@@ -118,6 +111,12 @@ struct vout_display_sys_t
     picture_pool_t *pool;
 
 #ifdef MODULE_NAME_IS_directx
+    /* Multi-monitor support */
+    HMONITOR             hmonitor;          /* handle of the current monitor */
+    GUID                 *display_driver;
+    HMONITOR             (WINAPI* MonitorFromWindow)(HWND, DWORD);
+    BOOL                 (WINAPI* GetMonitorInfo)(HMONITOR, LPMONITORINFO);
+
     /* Overlay alignment restrictions */
     int          i_align_src_boundary;
     int          i_align_src_size;
diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index ed3ba3b..8a329ec 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -594,7 +594,6 @@ static void Direct3DClose(vout_display_t *vd)
        IDirect3DDevice9_Release(sys->d3ddev);
 
     sys->d3ddev = NULL;
-    sys->hmonitor = NULL;
 }
 
 /**