Mercurial > mplayer.hg
diff libvo/vo_xvidix.c @ 31315:ad274a5b093b
For vos that support the new libvo API (provide UPDATE_SCREENINFO),
avoid duplicating some Gui-related code.
author | reimar |
---|---|
date | Sun, 13 Jun 2010 12:04:13 +0000 |
parents | 7681eab10aea |
children | 09dd92639e7b |
line wrap: on
line diff
--- a/libvo/vo_xvidix.c Sun Jun 13 11:51:41 2010 +0000 +++ b/libvo/vo_xvidix.c Sun Jun 13 12:04:13 2010 +0000 @@ -49,11 +49,6 @@ #include "vosub_vidix.h" #include "vidix/vidix.h" -#ifdef CONFIG_GUI -#include "gui/interface.h" -#endif - - static const vo_info_t info = { "X11 (VIDIX)", "xvidix", @@ -252,13 +247,6 @@ } mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey); -#ifdef CONFIG_GUI - if (use_gui) - guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window - else - { -#endif - #ifdef X11_FULLSCREEN if ((flags & VOFLAG_FULLSCREEN) || (flags & VOFLAG_SWSCALE)) aspect(&d_width, &d_height, A_ZOOM); @@ -289,10 +277,6 @@ CopyFromParent, "xvidix", title); XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); -#ifdef CONFIG_GUI - } -#endif - if ((!WinID) && (flags & VOFLAG_FULLSCREEN)) { vo_dx = 0;