diff options
Diffstat (limited to 'libvo/vo_gl2.c')
| -rw-r--r-- | libvo/vo_gl2.c | 47 |
1 files changed, 7 insertions, 40 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index a5e6050f44..71361916f4 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -33,9 +33,6 @@ #include "gl_common.h" #include "aspect.h" -#ifdef CONFIG_GUI -#include "gui/interface.h" -#endif #undef TEXTUREFORMAT_ALWAYS #ifdef __APPLE__ @@ -547,13 +544,6 @@ static int config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_ } #endif -#ifdef CONFIG_GUI -static int config_glx_gui(uint32_t d_width, uint32_t d_height) { - guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window - return 0; -} -#endif - static int initGl(uint32_t d_width, uint32_t d_height) { fragprog = lookupTex = 0; @@ -619,17 +609,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin image_width = width; image_format = format; - int_pause = 0; - -#ifdef CONFIG_GUI - if (use_gui) { - if (config_glx_gui(d_width, d_height) == -1) - return -1; - } -#ifndef GL_WIN32 - else -#endif -#endif #ifdef GL_WIN32 if (config_w32(width, height, d_width, d_height, flags, title, format) == -1) #else @@ -874,7 +853,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) { case VOCTRL_PAUSE: @@ -883,10 +862,8 @@ static int control(uint32_t request, void *data, ...) return VO_TRUE; case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); - case VOCTRL_GUISUPPORT: - return VO_TRUE; case VOCTRL_ONTOP: - vo_ontop(); + vo_gl_ontop(); return VO_TRUE; case VOCTRL_FULLSCREEN: vo_fullscreen(); @@ -895,7 +872,7 @@ static int control(uint32_t request, void *data, ...) resize(vo_dwidth, vo_dheight); return VO_TRUE; case VOCTRL_BORDER: - vo_border(); + vo_gl_border(); return VO_TRUE; case VOCTRL_GET_PANSCAN: return VO_TRUE; @@ -905,23 +882,13 @@ static int control(uint32_t request, void *data, ...) #ifndef GL_WIN32 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); } #endif case VOCTRL_UPDATE_SCREENINFO: |