diff options
Diffstat (limited to 'libvo/vo_xvmc.c')
| -rw-r--r-- | libvo/vo_xvmc.c | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index fb0266e081..2294e6dea1 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -49,7 +49,6 @@ #include "aspect.h" #include "subopt-helper.h" -#include "gui/interface.h" #include "libavutil/common.h" @@ -623,11 +622,6 @@ found_subpic: skip_surface_allocation: -#ifdef CONFIG_GUI - if(use_gui) - guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window - else -#endif { #ifdef CONFIG_XF86VM if ( vm ) @@ -1267,7 +1261,7 @@ assert(rndr->next_free_data_block_num == 0); return VO_TRUE; } -static int control(uint32_t request, void *data, ... ) +static int control(uint32_t request, void *data) { switch (request){ case VOCTRL_GET_DEINTERLACE: @@ -1283,8 +1277,6 @@ static int control(uint32_t request, void *data, ... ) case VOCTRL_GET_IMAGE: return get_image((mp_image_t *)data); //vo_xv - case VOCTRL_GUISUPPORT: - return VO_TRUE; case VOCTRL_ONTOP: vo_x11_ontop(); return VO_TRUE; @@ -1309,26 +1301,14 @@ static int control(uint32_t request, void *data, ... ) 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_xv_set_eq(xv_port, data, value); + struct voctrl_set_equalizer_args *args = data; + return vo_xv_set_eq(xv_port, 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_xv_get_eq(xv_port, data, value); + struct voctrl_get_equalizer_args *args = data; + return vo_xv_get_eq(xv_port, args->name, args->valueptr); } case VOCTRL_UPDATE_SCREENINFO: update_xinerama_info(); |