[vlc-commits] Make DirectX default on XP, instead of Direct3d

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Apr  4 00:18:54 2012 +0200| [c7c5709b6d4941157356d366169a5163e9c21349] | committer: Jean-Baptiste Kempf

Make DirectX default on XP, instead of Direct3d

This is not manageable.
After the black screens, as reproduced by Rémi, (fixed I hope)
After the grey stripes, (fixed too, I think with DevCaps2)
There is still:
 - the yellow middle stripe, with failing IDirect3DDevice9::StretchRect
 - the subtitle blending issue, with absolutly no messages #6542

We have enough to do with the delayed pictures not displayed, in case of
subtitles and the broken audio in so many situations (not to mention the
volume delay...)

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

 modules/video_output/msw/direct3d.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 560784b..616d271 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -143,6 +143,11 @@ static int Open(vlc_object_t *object)
     vout_display_t *vd = (vout_display_t *)object;
     vout_display_sys_t *sys;
 
+    OSVERSIONINFO winVer;
+    winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    if(GetVersionEx(&winVer) && winVer.dwMajorVersion < 6 && !object->b_force)
+        return VLC_EGENERIC;
+
     /* Allocate structure */
     vd->sys = sys = calloc(1, sizeof(vout_display_sys_t));
     if (!sys)