]> git.sesse.net Git - vlc/commitdiff
Cosmetics (msw).
authorLaurent Aimar <fenrir@videolan.org>
Sun, 3 Jan 2010 21:08:26 +0000 (22:08 +0100)
committerLaurent Aimar <fenrir@videolan.org>
Tue, 5 Jan 2010 20:06:31 +0000 (21:06 +0100)
modules/video_output/msw/common.h
modules/video_output/msw/direct3d.c

index 259c699e686e6eaca06734f45064a37ba2c5acfa..5372f0adec8adf49e29941a60bdfb6cc434e424d 100644 (file)
@@ -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;
index ed3ba3b33cd669ae7823278e0a85defad115166c..8a329ecdf1c915774810383a41c64876ee2f4baa 100644 (file)
@@ -594,7 +594,6 @@ static void Direct3DClose(vout_display_t *vd)
        IDirect3DDevice9_Release(sys->d3ddev);
 
     sys->d3ddev = NULL;
-    sys->hmonitor = NULL;
 }
 
 /**