diff options
Diffstat (limited to 'libvo/vo_xvidix.c')
| -rw-r--r-- | libvo/vo_xvidix.c | 46 |
1 files changed, 2 insertions, 44 deletions
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index b48168e6d5..c7481ae613 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -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 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, } 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 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, CopyFromParent, "xvidix", title); XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); -#ifdef CONFIG_GUI - } -#endif - if ((!WinID) && (flags & VOFLAG_FULLSCREEN)) { vo_dx = 0; @@ -409,20 +393,18 @@ static int preinit(const char *arg) if (!vo_init()) return -1; - if (vidix_preinit(vidix_name, &video_out_xvidix) != 0) + if (vidix_preinit(vidix_name, video_out_xvidix.old_functions) != 0) return 1; return 0; } -static int control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data) { switch (request) { case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t *) data)); - case VOCTRL_GUISUPPORT: - return VO_TRUE; case VOCTRL_GET_PANSCAN: if (!vo_config_count || !vo_fs) return VO_FALSE; @@ -439,30 +421,6 @@ static int control(uint32_t request, void *data, ...) set_window(0); } return VO_TRUE; - case VOCTRL_SET_EQUALIZER: - { - va_list ap; - int value; - - va_start(ap, data); - value = va_arg(ap, int); - - va_end(ap); - - return vidix_control(request, data, value); - } - case VOCTRL_GET_EQUALIZER: - { - va_list ap; - int *value; - - va_start(ap, data); - value = va_arg(ap, int *); - - va_end(ap); - - return vidix_control(request, data, value); - } case VOCTRL_UPDATE_SCREENINFO: aspect_save_screenres(vo_screenwidth, vo_screenheight); return VO_TRUE; |