Commit 43630c70 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Direct3D is now the default for every Windows version

Main reason is that tt has the nicer subtitles support
Broken configurations (looking at you S3 and Matrox) will be able to use
the DirectDraw module.
parent 6d67a6d1
...@@ -50,8 +50,7 @@ ...@@ -50,8 +50,7 @@
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
static int OpenVideoXP(vlc_object_t *); static int Open(vlc_object_t *);
static int OpenVideoVista(vlc_object_t *);
static void Close(vlc_object_t *); static void Close(vlc_object_t *);
#define DESKTOP_TEXT N_("Enable desktop mode ") #define DESKTOP_TEXT N_("Enable desktop mode ")
...@@ -76,13 +75,7 @@ vlc_module_begin () ...@@ -76,13 +75,7 @@ vlc_module_begin ()
set_capability("vout display", 240) set_capability("vout display", 240)
add_shortcut("direct3d") add_shortcut("direct3d")
set_callbacks(OpenVideoVista, Close) set_callbacks(Open, Close)
add_submodule()
set_description(N_("Direct3D video output (XP)"))
set_capability("vout display", 220)
add_shortcut("direct3d_xp")
set_callbacks(OpenVideoXP, Close)
vlc_module_end () vlc_module_end ()
...@@ -234,25 +227,6 @@ error: ...@@ -234,25 +227,6 @@ error:
return VLC_EGENERIC; return VLC_EGENERIC;
} }
static bool IsVistaOrAbove(void)
{
OSVERSIONINFO winVer;
winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
return GetVersionEx(&winVer) && winVer.dwMajorVersion > 5;
}
static int OpenVideoXP(vlc_object_t *obj)
{
/* Windows XP or lower, make sure this module isn't the default */
return IsVistaOrAbove() ? VLC_EGENERIC : Open(obj);
}
static int OpenVideoVista(vlc_object_t *obj)
{
/* Windows Vista or above, make this module the default */
return IsVistaOrAbove() ? Open(obj) : VLC_EGENERIC;
}
/** /**
* It destroyes a Direct3D vout display. * It destroyes a Direct3D vout display.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment