vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Jun 8 17:25:07 2011 +0200| [43630c7016b084c64ea7fb0b7f3c4c57c78abb8d] | committer: 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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=43630c7016b084c64ea7fb0b7f3c4c57c78abb8d --- modules/video_output/msw/direct3d.c | 30 ++---------------------------- 1 files changed, 2 insertions(+), 28 deletions(-) diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c index da11e58..05a50e2 100644 --- a/modules/video_output/msw/direct3d.c +++ b/modules/video_output/msw/direct3d.c @@ -50,8 +50,7 @@ /***************************************************************************** * Module descriptor *****************************************************************************/ -static int OpenVideoXP(vlc_object_t *); -static int OpenVideoVista(vlc_object_t *); +static int Open(vlc_object_t *); static void Close(vlc_object_t *); #define DESKTOP_TEXT N_("Enable desktop mode ") @@ -76,13 +75,7 @@ vlc_module_begin () set_capability("vout display", 240) add_shortcut("direct3d") - set_callbacks(OpenVideoVista, Close) - - add_submodule() - set_description(N_("Direct3D video output (XP)")) - set_capability("vout display", 220) - add_shortcut("direct3d_xp") - set_callbacks(OpenVideoXP, Close) + set_callbacks(Open, Close) vlc_module_end () @@ -234,25 +227,6 @@ error: 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. */ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
