diff options
Diffstat (limited to 'libvo/vo_x11.c')
-rw-r--r-- | libvo/vo_x11.c | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index da08265760..11c563d05d 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -56,11 +56,6 @@ static int CompletionType = -1; #include "mp_msg.h" #include "help_mp.h" -#ifdef CONFIG_GUI -#include "gui/interface.h" -#include "mplayer.h" -#endif - static const vo_info_t info = { "X11 ( XImage/Shm )", "x11", @@ -330,7 +325,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, old_vo_dwidth = -1; old_vo_dheight = -1; - int_pause = 0; if (!title) title = "MPlayer X11 (XImage/Shm) render"; @@ -358,11 +352,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, image_width = (width + 7) & (~7); image_height = height; -#ifdef CONFIG_GUI - if (use_gui) - guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window - else -#endif { #ifdef CONFIG_XF86VM if (vm) @@ -665,7 +654,7 @@ static int preinit(const char *arg) return 0; } -static int control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data) { switch (request) { @@ -677,33 +666,19 @@ static int control(uint32_t request, void *data, ...) return query_format(*((uint32_t *) data)); case VOCTRL_GET_IMAGE: return get_image(data); - case VOCTRL_GUISUPPORT: - return VO_TRUE; case VOCTRL_FULLSCREEN: vo_x11_fullscreen(); vo_x11_clearwindow(mDisplay, vo_window); 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 vo_x11_set_equalizer(data, value); + struct voctrl_set_equalizer_args *args = data; + return vo_x11_set_equalizer(args->name, args->value); } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int *value; - - va_start(ap, data); - value = va_arg(ap, int *); - - va_end(ap); - return vo_x11_get_equalizer(data, value); + struct voctrl_get_equalizer_args *args = data; + return vo_x11_get_equalizer(args->name, args->valueptr); } case VOCTRL_ONTOP: vo_x11_ontop(); |