May 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r33391 - in trunk: input/input.c input/mouse.h mp_fifo.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 12:44:57 2011 New Revision: 33391 Log: Support up to 20 mouse buttons, there really seem to be input devices with at least 12. Modified: trunk/input/input.c trunk/input/mouse.h trunk/mp_fifo.c Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Fri May 6 17:50:49 2011 (r33390) +++ trunk/input/input.c Sat May 7 12:44:57 2011 (r33391) @@ -268,6 +268,16 @@ static const mp_key_name_t key_names[] = { MOUSE_BTN7, "MOUSE_BTN7" }, { MOUSE_BTN8, "MOUSE_BTN8" }, { MOUSE_BTN9, "MOUSE_BTN9" }, + { MOUSE_BTN10, "MOUSE_BTN10" }, + { MOUSE_BTN11, "MOUSE_BTN11" }, + { MOUSE_BTN12, "MOUSE_BTN12" }, + { MOUSE_BTN13, "MOUSE_BTN13" }, + { MOUSE_BTN14, "MOUSE_BTN14" }, + { MOUSE_BTN15, "MOUSE_BTN15" }, + { MOUSE_BTN16, "MOUSE_BTN16" }, + { MOUSE_BTN17, "MOUSE_BTN17" }, + { MOUSE_BTN18, "MOUSE_BTN18" }, + { MOUSE_BTN19, "MOUSE_BTN19" }, { MOUSE_BTN0_DBL, "MOUSE_BTN0_DBL" }, { MOUSE_BTN1_DBL, "MOUSE_BTN1_DBL" }, { MOUSE_BTN2_DBL, "MOUSE_BTN2_DBL" }, @@ -278,6 +288,16 @@ static const mp_key_name_t key_names[] = { MOUSE_BTN7_DBL, "MOUSE_BTN7_DBL" }, { MOUSE_BTN8_DBL, "MOUSE_BTN8_DBL" }, { MOUSE_BTN9_DBL, "MOUSE_BTN9_DBL" }, + { MOUSE_BTN10_DBL, "MOUSE_BTN10_DBL" }, + { MOUSE_BTN11_DBL, "MOUSE_BTN11_DBL" }, + { MOUSE_BTN12_DBL, "MOUSE_BTN12_DBL" }, + { MOUSE_BTN13_DBL, "MOUSE_BTN13_DBL" }, + { MOUSE_BTN14_DBL, "MOUSE_BTN14_DBL" }, + { MOUSE_BTN15_DBL, "MOUSE_BTN15_DBL" }, + { MOUSE_BTN16_DBL, "MOUSE_BTN16_DBL" }, + { MOUSE_BTN17_DBL, "MOUSE_BTN17_DBL" }, + { MOUSE_BTN18_DBL, "MOUSE_BTN18_DBL" }, + { MOUSE_BTN19_DBL, "MOUSE_BTN19_DBL" }, { JOY_AXIS1_MINUS, "JOY_UP" }, { JOY_AXIS1_PLUS, "JOY_DOWN" }, { JOY_AXIS0_MINUS, "JOY_LEFT" }, Modified: trunk/input/mouse.h ============================================================================== --- trunk/input/mouse.h Fri May 6 17:50:49 2011 (r33390) +++ trunk/input/mouse.h Sat May 7 12:44:57 2011 (r33391) @@ -30,6 +30,17 @@ #define MOUSE_BTN7 (MOUSE_BASE+7) #define MOUSE_BTN8 (MOUSE_BASE+8) #define MOUSE_BTN9 (MOUSE_BASE+9) +#define MOUSE_BTN10 (MOUSE_BASE+10) +#define MOUSE_BTN11 (MOUSE_BASE+11) +#define MOUSE_BTN12 (MOUSE_BASE+12) +#define MOUSE_BTN13 (MOUSE_BASE+13) +#define MOUSE_BTN14 (MOUSE_BASE+14) +#define MOUSE_BTN15 (MOUSE_BASE+15) +#define MOUSE_BTN16 (MOUSE_BASE+16) +#define MOUSE_BTN17 (MOUSE_BASE+17) +#define MOUSE_BTN18 (MOUSE_BASE+18) +#define MOUSE_BTN19 (MOUSE_BASE+19) +#define MOUSE_BTN_LAST MOUSE_BTN19 #define MOUSE_BASE_DBL (0x300|MP_NO_REPEAT_KEY) #define MOUSE_BTN0_DBL (MOUSE_BASE_DBL+0) @@ -42,5 +53,16 @@ #define MOUSE_BTN7_DBL (MOUSE_BASE_DBL+7) #define MOUSE_BTN8_DBL (MOUSE_BASE_DBL+8) #define MOUSE_BTN9_DBL (MOUSE_BASE_DBL+9) +#define MOUSE_BTN10_DBL (MOUSE_BASE_DBL+10) +#define MOUSE_BTN11_DBL (MOUSE_BASE_DBL+11) +#define MOUSE_BTN12_DBL (MOUSE_BASE_DBL+12) +#define MOUSE_BTN13_DBL (MOUSE_BASE_DBL+13) +#define MOUSE_BTN14_DBL (MOUSE_BASE_DBL+14) +#define MOUSE_BTN15_DBL (MOUSE_BASE_DBL+15) +#define MOUSE_BTN16_DBL (MOUSE_BASE_DBL+16) +#define MOUSE_BTN17_DBL (MOUSE_BASE_DBL+17) +#define MOUSE_BTN18_DBL (MOUSE_BASE_DBL+18) +#define MOUSE_BTN19_DBL (MOUSE_BASE_DBL+19) +#define MOUSE_BTN_LAST_DBL MOUSE_BTN19_DBL #endif /* MPLAYER_MOUSE_H */ Modified: trunk/mp_fifo.c ============================================================================== --- trunk/mp_fifo.c Fri May 6 17:50:49 2011 (r33390) +++ trunk/mp_fifo.c Sat May 7 12:44:57 2011 (r33391) @@ -72,7 +72,7 @@ int mplayer_get_key(int fd){ unsigned doubleclick_time = 300; static void put_double(int code) { - if (code >= MOUSE_BTN0 && code <= MOUSE_BTN9) + if (code >= MOUSE_BTN0 && code <= MOUSE_BTN_LAST) mplayer_put_key_internal(code - MOUSE_BTN0 + MOUSE_BTN0_DBL); } @@ -83,7 +83,7 @@ void mplayer_put_key(int code) { // ignore system-doubleclick if we generate these events ourselves if (doubleclick_time && (code & ~MP_KEY_DOWN) >= MOUSE_BTN0_DBL && - (code & ~MP_KEY_DOWN) <= MOUSE_BTN9_DBL) + (code & ~MP_KEY_DOWN) <= MOUSE_BTN_LAST_DBL) return; mplayer_put_key_internal(code); if (code & MP_KEY_DOWN) {

1 0

r33388 - in trunk: libmpcodecs/vf_vo.c libvo/mga_template.c libvo/vo_aa.c libvo/vo_cvidix.c libvo/vo_dfbmga.c libvo/vo_directfb2.c libvo/vo_directx.c libvo/vo_dxr3.c libvo/vo_fbdev.c libvo/vo_gl.c ...
by iive 06 May '11

06 May '11

Author: iive Date: Fri May 6 12:32:46 2011 New Revision: 33388 Log: Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct, instead of employing vaarg. Do the same for vidix_control() too. Simplifies a lot of code. Allows direct passing of the struct from video filter system. Makes possible the complete removal of vaarg from libvo. Patch inspired by old work of uau. Modified: trunk/libmpcodecs/vf_vo.c trunk/libvo/mga_template.c trunk/libvo/vo_aa.c trunk/libvo/vo_cvidix.c trunk/libvo/vo_dfbmga.c trunk/libvo/vo_directfb2.c trunk/libvo/vo_directx.c trunk/libvo/vo_dxr3.c trunk/libvo/vo_fbdev.c trunk/libvo/vo_gl.c trunk/libvo/vo_gl2.c trunk/libvo/vo_kva.c trunk/libvo/vo_matrixview.c trunk/libvo/vo_svga.c trunk/libvo/vo_vdpau.c trunk/libvo/vo_vesa.c trunk/libvo/vo_winvidix.c trunk/libvo/vo_x11.c trunk/libvo/vo_xv.c trunk/libvo/vo_xvidix.c trunk/libvo/vo_xvmc.c trunk/libvo/vosub_vidix.c Modified: trunk/libmpcodecs/vf_vo.c ============================================================================== --- trunk/libmpcodecs/vf_vo.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libmpcodecs/vf_vo.c Fri May 6 12:32:46 2011 (r33388) @@ -105,15 +105,13 @@ static int control(struct vf_instance *v } case VFCTRL_SET_EQUALIZER: { - vf_equalizer_t *eq=data; if(!vo_config_count) return CONTROL_FALSE; // vo not configured? - return (video_out->control(VOCTRL_SET_EQUALIZER, eq->item, eq->value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; + return (video_out->control(VOCTRL_SET_EQUALIZER, data) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; } case VFCTRL_GET_EQUALIZER: { - vf_equalizer_t *eq=data; if(!vo_config_count) return CONTROL_FALSE; // vo not configured? - return (video_out->control(VOCTRL_GET_EQUALIZER, eq->item, &eq->value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; + return (video_out->control(VOCTRL_GET_EQUALIZER, data) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; } #ifdef CONFIG_ASS case VFCTRL_INIT_EOSD: Modified: trunk/libvo/mga_template.c ============================================================================== --- trunk/libvo/mga_template.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/mga_template.c Fri May 6 12:32:46 2011 (r33388) @@ -18,6 +18,7 @@ #include "fastmemcpy.h" #include "cpudetect.h" +#include "libmpcodecs/vf.h" #include "libswscale/swscale.h" #include "libavutil/imgutils.h" #include "libmpcodecs/vf_scale.h" @@ -246,11 +247,11 @@ static int control(uint32_t request, voi return draw_image(data); case VOCTRL_SET_EQUALIZER: { - va_list ap; + vf_equalizer_t *eq=data; short value; uint32_t luma,prev; - if ( strcmp( data,"brightness" ) && strcmp( data,"contrast" ) ) return VO_FALSE; + if ( strcmp( eq->item,"brightness" ) && strcmp( eq->item,"contrast" ) ) return VO_FALSE; if (ioctl(f,MGA_VID_GET_LUMA,&prev)) { perror("Error in mga_vid_config ioctl()"); @@ -260,12 +261,8 @@ static int control(uint32_t request, voi // printf("GET: 0x%4X 0x%4X \n",(prev>>16),(prev&0xffff)); - va_start(ap, data); - value = va_arg(ap, int); - va_end(ap); - -// printf("value: %d -> ",value); - value=((value+100)*255)/200-128; // maps -100=>-128 and +100=>127 +// printf("value: %d -> ",eq->value); + value=((eq->value+100)*255)/200-128; // maps -100=>-128 and +100=>127 // printf("%d \n",value); if(!strcmp(data,"contrast")) @@ -284,12 +281,11 @@ static int control(uint32_t request, voi case VOCTRL_GET_EQUALIZER: { - va_list ap; - int * value; + vf_equalizer_t *eq=data; short val; uint32_t luma; - if ( strcmp( data,"brightness" ) && strcmp( data,"contrast" ) ) return VO_FALSE; + if ( strcmp( eq->item,"brightness" ) && strcmp( eq->item,"contrast" ) ) return VO_FALSE; if (ioctl(f,MGA_VID_GET_LUMA,&luma)) { perror("Error in mga_vid_config ioctl()"); @@ -297,16 +293,12 @@ static int control(uint32_t request, voi return VO_FALSE; } - if ( !strcmp( data,"contrast" ) ) + if ( !strcmp( eq->item,"contrast" ) ) val=(luma & 0xFFFF); else val=(luma >> 16); - va_start(ap, data); - value = va_arg(ap, int*); - va_end(ap); - - *value = (val*200)/255; + eq->value = (val*200)/255; return VO_TRUE; } Modified: trunk/libvo/vo_aa.c ============================================================================== --- trunk/libvo/vo_aa.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_aa.c Fri May 6 12:32:46 2011 (r33388) @@ -36,6 +36,7 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "aspect.h" #include "libswscale/swscale.h" #include "libmpcodecs/vf_scale.h" @@ -731,31 +732,21 @@ static int control(uint32_t request, voi case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); case VOCTRL_SET_EQUALIZER: { - va_list ap; - int val; - - va_start(ap, data); - val = va_arg(ap, int); - va_end(ap); + vf_equalizer_t *eq=data; - if(strcmp((char*)data,"contrast") == 0) - p->contrast = ( val + 100 ) * 64 / 100; - else if(strcmp((char*)data,"brightness") == 0) - p->bright = ( val + 100) * 128 / 100; + if(strcmp(eq->item,"contrast") == 0) + p->contrast = ( eq->value + 100 ) * 64 / 100; + else if(strcmp(eq->item,"brightness") == 0) + p->bright = ( eq->value + 100) * 128 / 100; return VO_TRUE; } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int* val; - - va_start(ap, data); - val = va_arg(ap, int*); - va_end(ap); + vf_equalizer_t *eq=data; - if(strcmp((char*)data,"contrast") == 0) - *val = (p->contrast - 64) * 100 / 64; - else if(strcmp((char*)data,"brightness") == 0) - *val = (p->bright - 128) * 100 / 128; + if(strcmp(eq->item,"contrast") == 0) + eq->value = (p->contrast - 64) * 100 / 64; + else if(strcmp(eq->item,"brightness") == 0) + eq->value = (p->bright - 128) * 100 / 128; return VO_TRUE; } Modified: trunk/libvo/vo_cvidix.c ============================================================================== --- trunk/libvo/vo_cvidix.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_cvidix.c Fri May 6 12:32:46 2011 (r33388) @@ -173,24 +173,6 @@ static int control(uint32_t request, voi else vo_fs=1; setup_vidix(); 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); - } } return vidix_control(request, data); } Modified: trunk/libvo/vo_dfbmga.c ============================================================================== --- trunk/libvo/vo_dfbmga.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_dfbmga.c Fri May 6 12:32:46 2011 (r33388) @@ -30,6 +30,7 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "fastmemcpy.h" #include "sub/sub.h" #include "mp_msg.h" @@ -1426,25 +1427,13 @@ control( uint32_t request, void *data, . case VOCTRL_SET_EQUALIZER: { - va_list ap; - int value; - - va_start( ap, data ); - value = va_arg( ap, int ); - va_end( ap ); - - return set_equalizer( data, value ); + vf_equalizer_t *eq=data; + return set_equalizer( eq->item, eq->value ); } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int *value; - - va_start( ap, data ); - value = va_arg( ap, int* ); - va_end( ap ); - - return get_equalizer( data, value ); + vf_equalizer_t *eq=data; + return get_equalizer( eq->item, &eq->value ); } } Modified: trunk/libvo/vo_directfb2.c ============================================================================== --- trunk/libvo/vo_directfb2.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_directfb2.c Fri May 6 12:32:46 2011 (r33388) @@ -32,6 +32,7 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "fastmemcpy.h" #include "sub/sub.h" #include "mp_msg.h" @@ -1382,25 +1383,13 @@ static int control(uint32_t request, voi return put_image(data); case VOCTRL_SET_EQUALIZER: { - va_list ap; - int value; - - va_start(ap, data); - value = va_arg(ap, int); - va_end(ap); - - return directfb_set_video_eq(data, value); + vf_equalizer_t *eq=data; + return directfb_set_video_eq(eq->item, eq->value); } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int *value; - - va_start(ap, data); - value = va_arg(ap, int*); - va_end(ap); - - return directfb_get_video_eq(data, value); + vf_equalizer_t *eq=data; + return directfb_get_video_eq(eq->item, &eq->value); } }; return VO_NOTIMPL; Modified: trunk/libvo/vo_directx.c ============================================================================== --- trunk/libvo/vo_directx.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_directx.c Fri May 6 12:32:46 2011 (r33388) @@ -29,6 +29,7 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "fastmemcpy.h" #include "input/input.h" #include "libmpcodecs/vd.h" @@ -1566,22 +1567,12 @@ static int control(uint32_t request, voi 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 color_ctrl_set(data, value); + vf_equalizer_t *eq=data; + return color_ctrl_set(eq->item, eq->value); } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int *value; - - va_start(ap, data); - value = va_arg(ap, int*); - va_end(ap); - return color_ctrl_get(data, value); + vf_equalizer_t *eq=data; + return color_ctrl_get(eq->item, &eq->value); } case VOCTRL_UPDATE_SCREENINFO: if (vidmode) { Modified: trunk/libvo/vo_dxr3.c ============================================================================== --- trunk/libvo/vo_dxr3.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_dxr3.c Fri May 6 12:32:46 2011 (r33388) @@ -41,6 +41,7 @@ #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "aspect.h" #include "sub/spuenc.h" #include "sub/sub.h" @@ -252,22 +253,17 @@ static int control(uint32_t request, voi } case VOCTRL_SET_EQUALIZER: { - va_list ap; - int value; + vf_equalizer_t *eq=data; em8300_bcs_t bcs; - va_start(ap, data); - value = va_arg(ap, int); - va_end(ap); - if (ioctl(fd_control, EM8300_IOCTL_GETBCS, &bcs) < 0) return VO_FALSE; - if (!strcasecmp(data, "brightness")) - bcs.brightness = (value+100)*5; - else if (!strcasecmp(data, "contrast")) - bcs.contrast = (value+100)*5; - else if (!strcasecmp(data, "saturation")) - bcs.saturation = (value+100)*5; + if (!strcasecmp(eq->item, "brightness")) + bcs.brightness = (eq->value+100)*5; + else if (!strcasecmp(eq->item, "contrast")) + bcs.contrast = (eq->value+100)*5; + else if (!strcasecmp(eq->item, "saturation")) + bcs.saturation = (eq->value+100)*5; else return VO_FALSE; if (ioctl(fd_control, EM8300_IOCTL_SETBCS, &bcs) < 0) @@ -276,23 +272,18 @@ static int control(uint32_t request, voi } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int *value; + vf_equalizer_t *eq=data; em8300_bcs_t bcs; - va_start(ap, data); - value = va_arg(ap, int*); - va_end(ap); - if (ioctl(fd_control, EM8300_IOCTL_GETBCS, &bcs) < 0) return VO_FALSE; - if (!strcasecmp(data, "brightness")) - *value = (bcs.brightness/5)-100; - else if (!strcasecmp(data, "contrast")) - *value = (bcs.contrast/5)-100; - else if (!strcasecmp(data, "saturation")) - *value = (bcs.saturation/5)-100; + if (!strcasecmp(eq->item, "brightness")) + eq->value = (bcs.brightness/5)-100; + else if (!strcasecmp(eq->item, "contrast")) + eq->value = (bcs.contrast/5)-100; + else if (!strcasecmp(eq->item, "saturation")) + eq->value = (bcs.saturation/5)-100; else return VO_FALSE; return VO_TRUE; Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_fbdev.c Fri May 6 12:32:46 2011 (r33388) @@ -1163,27 +1163,8 @@ static int control(uint32_t request, voi if (vidix_name) { switch (request) { 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); - } + return vidix_control(request, data); } } #endif Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_gl.c Fri May 6 12:32:46 2011 (r33388) @@ -32,6 +32,7 @@ #include "subopt-helper.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "sub/font_load.h" #include "sub/sub.h" @@ -1361,34 +1362,26 @@ static int control(uint32_t request, voi case VOCTRL_GET_EQUALIZER: if (is_yuv) { int i; - va_list va; - int *value; - va_start(va, data); - value = va_arg(va, int *); - va_end(va); + vf_equalizer_t *eq=data; for (i = 0; eq_map[i].name; i++) - if (strcmp(data, eq_map[i].name) == 0) break; + if (strcmp(eq->item, eq_map[i].name) == 0) break; if (!(eq_map[i].supportmask & (1 << use_yuv))) break; - *value = *eq_map[i].value; + eq->value = *eq_map[i].value; return VO_TRUE; } break; case VOCTRL_SET_EQUALIZER: if (is_yuv) { int i; - va_list va; - int value; - va_start(va, data); - value = va_arg(va, int); - va_end(va); + vf_equalizer_t *eq=data; for (i = 0; eq_map[i].name; i++) - if (strcmp(data, eq_map[i].name) == 0) break; + if (strcmp(eq->item, eq_map[i].name) == 0) break; if (!(eq_map[i].supportmask & (1 << use_yuv))) break; - *eq_map[i].value = value; + *eq_map[i].value = eq->value; if (strcmp(data, "gamma") == 0) - eq_rgamma = eq_ggamma = eq_bgamma = value; + eq_rgamma = eq_ggamma = eq_bgamma = eq->value; update_yuvconv(); return VO_TRUE; } Modified: trunk/libvo/vo_gl2.c ============================================================================== --- trunk/libvo/vo_gl2.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_gl2.c Fri May 6 12:32:46 2011 (r33388) @@ -29,6 +29,7 @@ #include "subopt-helper.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "sub/sub.h" #include "gl_common.h" @@ -915,23 +916,13 @@ static int control(uint32_t request, voi #ifdef CONFIG_GL_X11 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); + vf_equalizer_t *eq=data; + return vo_x11_set_equalizer(eq->item, eq->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); + vf_equalizer_t *eq=data; + return vo_x11_get_equalizer(eq->item, &eq->value); } #endif case VOCTRL_UPDATE_SCREENINFO: Modified: trunk/libvo/vo_kva.c ============================================================================== --- trunk/libvo/vo_kva.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_kva.c Fri May 6 12:32:46 2011 (r33388) @@ -40,6 +40,7 @@ #include "help_mp.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "aspect.h" #include "fastmemcpy.h" @@ -965,26 +966,14 @@ static int control(uint32_t request, voi case VOCTRL_SET_EQUALIZER: { - va_list ap; - int value; - - va_start(ap, data); - value = va_arg(ap, int); - va_end(ap); - - return color_ctrl_set(data, value); + vf_equalizer_t *eq=data; + return color_ctrl_set(eq->item, eq->value); } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int *value; - - va_start(ap, data); - value = va_arg(ap, int *); - va_end(ap); - - return color_ctrl_get(data, value); + vf_equalizer_t *eq=data; + return color_ctrl_get(eq->item, &eq->value); } case VOCTRL_UPDATE_SCREENINFO: Modified: trunk/libvo/vo_matrixview.c ============================================================================== --- trunk/libvo/vo_matrixview.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_matrixview.c Fri May 6 12:32:46 2011 (r33388) @@ -30,6 +30,7 @@ #include "subopt-helper.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "gl_common.h" #include "libswscale/swscale.h" #include "libmpcodecs/vf_scale.h" @@ -296,29 +297,22 @@ static int control(uint32_t request, voi return VO_TRUE; case VOCTRL_GET_EQUALIZER: { - va_list va; - int *value; - va_start(va, data); - value = va_arg(va, int *); - va_end(va); - if (strcasecmp(data, "contrast") == 0) { - *value = eq_contrast; - } else if (strcasecmp(data, "brightness") == 0) { - *value = eq_brightness; + vf_equalizer_t *eq=data; + + if (strcasecmp(eq->item, "contrast") == 0) { + eq->value = eq_contrast; + } else if (strcasecmp(eq->item, "brightness") == 0) { + eq->value = eq_brightness; } } return VO_TRUE; case VOCTRL_SET_EQUALIZER: { - va_list va; - int value; - va_start(va, data); - value = va_arg(va, int); - va_end(va); - if (strcasecmp(data, "contrast") == 0) { - contrast_set(value); - } else if (strcasecmp(data, "brightness") == 0) { - brightness_set(value); + vf_equalizer_t *eq=data; + if (strcasecmp(eq->item, "contrast") == 0) { + contrast_set(eq->value); + } else if (strcasecmp(eq->item, "brightness") == 0) { + brightness_set(eq->value); } } return VO_TRUE; Modified: trunk/libvo/vo_svga.c ============================================================================== --- trunk/libvo/vo_svga.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_svga.c Fri May 6 12:32:46 2011 (r33388) @@ -366,30 +366,6 @@ static int control(uint32_t request, voi #ifdef CONFIG_VIDIX if (vidix_name[0]) { - switch (request) { - 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); - } - } return vidix_control(request, data); } #endif Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_vdpau.c Fri May 6 12:32:46 2011 (r33388) @@ -39,6 +39,7 @@ #include "mp_msg.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "x11_common.h" #include "aspect.h" #include "sub/font_load.h" @@ -1367,26 +1368,15 @@ static int control(uint32_t request, voi resize(); return VO_TRUE; case VOCTRL_SET_EQUALIZER: { - va_list ap; - int value; + vf_equalizer_t *eq=data; if (image_format == IMGFMT_BGRA) return VO_NOTIMPL; - va_start(ap, data); - value = va_arg(ap, int); - - va_end(ap); - return set_equalizer(data, value); + return set_equalizer(eq->item, eq->value); } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int *value; - - va_start(ap, data); - value = va_arg(ap, int *); - - va_end(ap); - return get_equalizer(data, value); + vf_equalizer_t *eq=data; + return get_equalizer(eq->item, &eq->value); } case VOCTRL_ONTOP: vo_x11_ontop(); Modified: trunk/libvo/vo_vesa.c ============================================================================== --- trunk/libvo/vo_vesa.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_vesa.c Fri May 6 12:32:46 2011 (r33388) @@ -1092,30 +1092,6 @@ static int control(uint32_t request, voi #ifdef CONFIG_VIDIX if (vidix_name) { - switch (request) { - 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, (int *)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); - } - } return vidix_control(request, data); } #endif Modified: trunk/libvo/vo_winvidix.c ============================================================================== --- trunk/libvo/vo_winvidix.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_winvidix.c Fri May 6 12:32:46 2011 (r33388) @@ -338,28 +338,6 @@ static int control(uint32_t request, voi break; case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); - 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, (int *)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); - } } return vidix_control(request, data); // return VO_NOTIMPL; Modified: trunk/libvo/vo_x11.c ============================================================================== --- trunk/libvo/vo_x11.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_x11.c Fri May 6 12:32:46 2011 (r33388) @@ -23,6 +23,7 @@ #include "config.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include "aspect.h" @@ -674,25 +675,13 @@ static int control(uint32_t request, voi 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); + vf_equalizer_t *eq=data; + return vo_x11_set_equalizer(eq->item, &(eq->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); + vf_equalizer_t *eq=data; + return vo_x11_get_equalizer(eq->item, &eq->value); } case VOCTRL_ONTOP: vo_x11_ontop(); Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_xv.c Fri May 6 12:32:46 2011 (r33388) @@ -43,6 +43,7 @@ Buffer allocation: #include "help_mp.h" #include "video_out.h" #include "video_out_internal.h" +#include "libmpcodecs/vf.h" #include <X11/Xlib.h> @@ -757,27 +758,13 @@ static int control(uint32_t request, voi 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); + vf_equalizer_t *eq=data; + return vo_xv_set_eq(xv_port, eq->item, eq->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); + vf_equalizer_t *eq=data; + return vo_xv_get_eq(xv_port, eq->item, &eq->value); } case VOCTRL_ONTOP: vo_x11_ontop(); Modified: trunk/libvo/vo_xvidix.c ============================================================================== --- trunk/libvo/vo_xvidix.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_xvidix.c Fri May 6 12:32:46 2011 (r33388) @@ -413,30 +413,6 @@ static int control(uint32_t request, voi 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; Modified: trunk/libvo/vo_xvmc.c ============================================================================== --- trunk/libvo/vo_xvmc.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vo_xvmc.c Fri May 6 12:32:46 2011 (r33388) @@ -26,6 +26,7 @@ #include "video_out.h" #include "video_out_internal.h" #include "osdep/timer.h" +#include "libmpcodecs/vf.h" #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -1332,26 +1333,14 @@ static int control(uint32_t request, voi 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); + vf_equalizer_t *eq=data; + return vo_xv_set_eq(xv_port, eq->item, eq->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); + vf_equalizer_t *eq=data; + return vo_xv_get_eq(xv_port, eq->item, &eq->value); } case VOCTRL_UPDATE_SCREENINFO: update_xinerama_info(); Modified: trunk/libvo/vosub_vidix.c ============================================================================== --- trunk/libvo/vosub_vidix.c Fri May 6 12:12:54 2011 (r33387) +++ trunk/libvo/vosub_vidix.c Fri May 6 12:32:46 2011 (r33388) @@ -45,6 +45,7 @@ #include "sub/sub.h" #include "vosub_vidix.h" +#include "libmpcodecs/vf.h" #include "libmpcodecs/vfcap.h" #include "libmpcodecs/mp_image.h" @@ -596,36 +597,32 @@ uint32_t vidix_control(uint32_t request, return VO_TRUE; case VOCTRL_SET_EQUALIZER: { - va_list ap; - int value; + vf_equalizer_t *eq=data; vidix_video_eq_t info; if(!video_on) return VO_FALSE; - va_start(ap, data); - value = va_arg(ap, int); - va_end(ap); -// printf("vidix seteq %s -> %d \n",data,value); +// printf("vidix seteq %s -> %d \n",eq->item,eq->value); /* vidix eq ranges are -1000..1000 */ - if (!strcasecmp(data, "brightness")) + if (!strcasecmp(eq->item, "brightness")) { - info.brightness = value*10; + info.brightness = eq->value*10; info.cap = VEQ_CAP_BRIGHTNESS; } - else if (!strcasecmp(data, "contrast")) + else if (!strcasecmp(eq->item, "contrast")) { - info.contrast = value*10; + info.contrast = eq->value*10; info.cap = VEQ_CAP_CONTRAST; } - else if (!strcasecmp(data, "saturation")) + else if (!strcasecmp(eq->item, "saturation")) { - info.saturation = value*10; + info.saturation = eq->value*10; info.cap = VEQ_CAP_SATURATION; } - else if (!strcasecmp(data, "hue")) + else if (!strcasecmp(eq->item, "hue")) { - info.hue = value*10; + info.hue = eq->value*10; info.cap = VEQ_CAP_HUE; } @@ -635,38 +632,33 @@ uint32_t vidix_control(uint32_t request, } case VOCTRL_GET_EQUALIZER: { - va_list ap; - int *value; + vf_equalizer_t *eq=data; vidix_video_eq_t info; if(!video_on) return VO_FALSE; if (vdlPlaybackGetEq(vidix_handler, &info) != 0) return VO_FALSE; - va_start(ap, data); - value = va_arg(ap, int*); - va_end(ap); - /* vidix eq ranges are -1000..1000 */ - if (!strcasecmp(data, "brightness")) + if (!strcasecmp(eq->item, "brightness")) { if (info.cap & VEQ_CAP_BRIGHTNESS) - *value = info.brightness/10; + eq->value = info.brightness/10; } - else if (!strcasecmp(data, "contrast")) + else if (!strcasecmp(eq->item, "contrast")) { if (info.cap & VEQ_CAP_CONTRAST) - *value = info.contrast/10; + eq->value = info.contrast/10; } - else if (!strcasecmp(data, "saturation")) + else if (!strcasecmp(eq->item, "saturation")) { if (info.cap & VEQ_CAP_SATURATION) - *value = info.saturation/10; + eq->value = info.saturation/10; } - else if (!strcasecmp(data, "hue")) + else if (!strcasecmp(eq->item, "hue")) { if (info.cap & VEQ_CAP_HUE) - *value = info.hue/10; + eq->value = info.hue/10; } return VO_TRUE;

3 2

r33390 - trunk/gui/win32/interface.c
by ib 06 May '11

06 May '11

Author: ib Date: Fri May 6 17:50:49 2011 New Revision: 33390 Log: Replace _beginthreadex() by CreateThread(). This fixes a compile problem with Cygwin. Patch by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/gui/win32/interface.c Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Fri May 6 15:10:39 2011 (r33389) +++ trunk/gui/win32/interface.c Fri May 6 17:50:49 2011 (r33390) @@ -493,7 +493,7 @@ void guiInit(void) /* Create The gui thread */ if (!mygui) { - hThread = _beginthreadex(NULL, 0, GuiThread, NULL, 0, &threadId); + hThread = CreateThread(NULL, 0, GuiThread, NULL, 0, &threadId); mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] Creating GUI Thread 0x%04x\n", threadId); }

1 0

r33387 - in trunk/libvo: x11_common.c x11_common.h
by iive 06 May '11

06 May '11

Author: iive Date: Fri May 6 12:12:54 2011 New Revision: 33387 Log: Make vo_xv_set/get_eq() functions expect "const char *" for attribute name. Prevents warning when used with vf_equalizer_t struct. Modified: trunk/libvo/x11_common.c trunk/libvo/x11_common.h Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Fri May 6 11:42:22 2011 (r33386) +++ trunk/libvo/x11_common.c Fri May 6 12:12:54 2011 (r33387) @@ -1894,7 +1894,7 @@ uint32_t vo_x11_get_equalizer(char *name } #ifdef CONFIG_XV -int vo_xv_set_eq(uint32_t xv_port, char *name, int value) +int vo_xv_set_eq(uint32_t xv_port, const char *name, int value) { XvAttribute *attributes; int i, howmany, xv_atom; @@ -1964,7 +1964,7 @@ int vo_xv_set_eq(uint32_t xv_port, char return VO_FALSE; } -int vo_xv_get_eq(uint32_t xv_port, char *name, int *value) +int vo_xv_get_eq(uint32_t xv_port, const char *name, int *value) { XvAttribute *attributes; Modified: trunk/libvo/x11_common.h ============================================================================== --- trunk/libvo/x11_common.h Fri May 6 11:42:22 2011 (r33386) +++ trunk/libvo/x11_common.h Fri May 6 12:12:54 2011 (r33387) @@ -102,8 +102,8 @@ extern XSizeHints vo_hint; //XvPortID xv_port; extern unsigned int xv_port; -int vo_xv_set_eq(uint32_t xv_port, char * name, int value); -int vo_xv_get_eq(uint32_t xv_port, char * name, int *value); +int vo_xv_set_eq(uint32_t xv_port, const char * name, int value); +int vo_xv_get_eq(uint32_t xv_port, const char * name, int *value); int vo_xv_enable_vsync(void);

1 0

r33386 - trunk/gui/win32/dialogs.h
by ib 06 May '11

06 May '11

Author: ib Date: Fri May 6 11:42:22 2011 New Revision: 33386 Log: Cosmetic: Remove empty line. Modified: trunk/gui/win32/dialogs.h Modified: trunk/gui/win32/dialogs.h ============================================================================== --- trunk/gui/win32/dialogs.h Fri May 6 11:35:46 2011 (r33385) +++ trunk/gui/win32/dialogs.h Fri May 6 11:42:22 2011 (r33386) @@ -34,7 +34,6 @@ #define SOLID_GREY (HBRUSH) CreateSolidBrush(RGB(232, 232, 232)) #define SOLID_GREY2 (HBRUSH) CreateSolidBrush(RGB(175, 175, 175)) - #define MAXFILE 1024 #define COPYRIGHT " MPlayer GUI for Windows\n\n" \

1 0

r33385 - in trunk/gui/win32: dialogs.h interface.c preferences.c
by ib 06 May '11

06 May '11

Author: ib Date: Fri May 6 11:35:46 2011 New Revision: 33385 Log: Fix bug with gfree() definition in Win32 GUI. gfree (taking pointer of pointer) was erroneously defined free (taking pointer). Get rid of gfree() by using suitable free() statements. Patch by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/gui/win32/dialogs.h trunk/gui/win32/interface.c trunk/gui/win32/preferences.c Modified: trunk/gui/win32/dialogs.h ============================================================================== --- trunk/gui/win32/dialogs.h Fri May 6 10:47:18 2011 (r33384) +++ trunk/gui/win32/dialogs.h Fri May 6 11:35:46 2011 (r33385) @@ -34,7 +34,6 @@ #define SOLID_GREY (HBRUSH) CreateSolidBrush(RGB(232, 232, 232)) #define SOLID_GREY2 (HBRUSH) CreateSolidBrush(RGB(175, 175, 175)) -#define gfree free #define MAXFILE 1024 Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Fri May 6 10:47:18 2011 (r33384) +++ trunk/gui/win32/interface.c Fri May 6 11:35:46 2011 (r33385) @@ -433,8 +433,10 @@ void mplSetFileName(char *dir, char *nam guiSetDF(guiIntfStruct.Filename, dir, name); guiIntfStruct.StreamType = type; - free((void **) &guiIntfStruct.AudioFile); - free((void **) &guiIntfStruct.Subtitlename); + free(guiIntfStruct.AudioFile); + guiIntfStruct.AudioFile = NULL; + free(guiIntfStruct.Subtitlename); + guiIntfStruct.Subtitlename = NULL; } void mplFullScreen( void ) Modified: trunk/gui/win32/preferences.c ============================================================================== --- trunk/gui/win32/preferences.c Fri May 6 10:47:18 2011 (r33384) +++ trunk/gui/win32/preferences.c Fri May 6 11:35:46 2011 (r33385) @@ -561,14 +561,14 @@ static LRESULT CALLBACK PrefsWndProc(HWN if(guiIntfStruct.Playing) guiGetEvent(guiCEvent, (void *)guiSetStop); /* Set the video driver */ - gfree(video_driver_list[0]); + free(video_driver_list[0]); strl = SendMessage(vo_driver, CB_GETCURSEL, 0, 0); video_driver_list[0] = malloc(strl); SendMessage(vo_driver, CB_GETLBTEXT, (WPARAM)strl, (LPARAM)video_driver_list[0]); /* Set the audio driver */ - gfree(audio_driver_list[0]); + free(audio_driver_list[0]); strl = SendMessage(ao_driver, CB_GETCURSEL, 0, 0); audio_driver_list[0] = malloc(strl); SendMessage(ao_driver, CB_GETLBTEXT, (WPARAM)strl,

1 0

r33384 - trunk/gui/win32/wincfg.c
by ib 06 May '11

06 May '11

Author: ib Date: Fri May 6 10:47:18 2011 New Revision: 33384 Log: Fix compilation error with Win32 GUI. A "gui/win32/wincfg.c:59: error: static declaration of 'gui_conf' follows non-static declaration" occurred because gui_conf recently was changed 'extern'. Patch by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/gui/win32/wincfg.c Modified: trunk/gui/win32/wincfg.c ============================================================================== --- trunk/gui/win32/wincfg.c Fri May 6 10:17:05 2011 (r33383) +++ trunk/gui/win32/wincfg.c Fri May 6 10:47:18 2011 (r33384) @@ -56,7 +56,7 @@ int gui_main_pos_y = -2; int gui_sub_pos_x = -1; int gui_sub_pos_y = -1; -static m_config_t *gui_conf; +m_config_t *gui_conf; static const m_option_t gui_opts[] = { { "priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL},

1 0

r33376 - in trunk/gui: cfg.c interface.c
by ib 06 May '11

06 May '11

Author: ib Date: Thu May 5 13:56:34 2011 New Revision: 33376 Log: Cosmetic: uncrustify related indent adjustments Comments may now be nicely indented after the mp-uncrustify-style.cfg update. Slightly change audio_equ_row definition so that uncrustify doesn't get confused and does proper indenting. Modified: trunk/gui/cfg.c trunk/gui/interface.c Modified: trunk/gui/cfg.c ============================================================================== --- trunk/gui/cfg.c Thu May 5 13:13:33 2011 (r33375) +++ trunk/gui/cfg.c Thu May 5 13:56:34 2011 (r33376) @@ -146,82 +146,82 @@ static const m_option_t gui_opts[] = { { "equ_channel_6", &gtkEquChannel6, CONF_TYPE_STRING, 0, 0, 0, NULL }, #define audio_equ_row(i, j) \ - { "equ_band_" # i # j, &gtkEquChannels[i][j], CONF_TYPE_FLOAT, CONF_RANGE, -15.0, 15.0, NULL }, - audio_equ_row(0, 0) audio_equ_row(0, 1) audio_equ_row(0, 2) audio_equ_row(0, 3) audio_equ_row(0, 4) audio_equ_row(0, 5) audio_equ_row(0, 6) audio_equ_row(0, 7) audio_equ_row(0, 8) audio_equ_row(0, 9) - audio_equ_row(1, 0) audio_equ_row(1, 1) audio_equ_row(1, 2) audio_equ_row(1, 3) audio_equ_row(1, 4) audio_equ_row(1, 5) audio_equ_row(1, 6) audio_equ_row(1, 7) audio_equ_row(1, 8) audio_equ_row(1, 9) - audio_equ_row(2, 0) audio_equ_row(2, 1) audio_equ_row(2, 2) audio_equ_row(2, 3) audio_equ_row(2, 4) audio_equ_row(2, 5) audio_equ_row(2, 6) audio_equ_row(2, 7) audio_equ_row(2, 8) audio_equ_row(2, 9) - audio_equ_row(3, 0) audio_equ_row(3, 1) audio_equ_row(3, 2) audio_equ_row(3, 3) audio_equ_row(3, 4) audio_equ_row(3, 5) audio_equ_row(3, 6) audio_equ_row(3, 7) audio_equ_row(3, 8) audio_equ_row(3, 9) - audio_equ_row(4, 0) audio_equ_row(4, 1) audio_equ_row(4, 2) audio_equ_row(4, 3) audio_equ_row(4, 4) audio_equ_row(4, 5) audio_equ_row(4, 6) audio_equ_row(4, 7) audio_equ_row(4, 8) audio_equ_row(4, 9) - audio_equ_row(5, 0) audio_equ_row(5, 1) audio_equ_row(5, 2) audio_equ_row(5, 3) audio_equ_row(5, 4) audio_equ_row(5, 5) audio_equ_row(5, 6) audio_equ_row(5, 7) audio_equ_row(5, 8) audio_equ_row(5, 9) + { "equ_band_" # i # j, &gtkEquChannels[i][j], CONF_TYPE_FLOAT, CONF_RANGE, -15.0, 15.0, NULL } + audio_equ_row(0, 0), audio_equ_row(0, 1), audio_equ_row(0, 2), audio_equ_row(0, 3), audio_equ_row(0, 4), audio_equ_row(0, 5), audio_equ_row(0, 6), audio_equ_row(0, 7), audio_equ_row(0, 8), audio_equ_row(0, 9), + audio_equ_row(1, 0), audio_equ_row(1, 1), audio_equ_row(1, 2), audio_equ_row(1, 3), audio_equ_row(1, 4), audio_equ_row(1, 5), audio_equ_row(1, 6), audio_equ_row(1, 7), audio_equ_row(1, 8), audio_equ_row(1, 9), + audio_equ_row(2, 0), audio_equ_row(2, 1), audio_equ_row(2, 2), audio_equ_row(2, 3), audio_equ_row(2, 4), audio_equ_row(2, 5), audio_equ_row(2, 6), audio_equ_row(2, 7), audio_equ_row(2, 8), audio_equ_row(2, 9), + audio_equ_row(3, 0), audio_equ_row(3, 1), audio_equ_row(3, 2), audio_equ_row(3, 3), audio_equ_row(3, 4), audio_equ_row(3, 5), audio_equ_row(3, 6), audio_equ_row(3, 7), audio_equ_row(3, 8), audio_equ_row(3, 9), + audio_equ_row(4, 0), audio_equ_row(4, 1), audio_equ_row(4, 2), audio_equ_row(4, 3), audio_equ_row(4, 4), audio_equ_row(4, 5), audio_equ_row(4, 6), audio_equ_row(4, 7), audio_equ_row(4, 8), audio_equ_row(4, 9), + audio_equ_row(5, 0), audio_equ_row(5, 1), audio_equ_row(5, 2), audio_equ_row(5, 3), audio_equ_row(5, 4), audio_equ_row(5, 5), audio_equ_row(5, 6), audio_equ_row(5, 7), audio_equ_row(5, 8), audio_equ_row(5, 9), #undef audio_equ_row - { "playbar", &gtkEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "load_fullscreen", &gtkLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "show_videowin", &gtkShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "playbar", &gtkEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "load_fullscreen", &gtkLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "show_videowin", &gtkShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, - { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, - { "gui_video_out_pos_x", &gui_sub_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, - { "gui_video_out_pos_y", &gui_sub_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, + { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, + { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, + { "gui_video_out_pos_x", &gui_sub_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, + { "gui_video_out_pos_y", &gui_sub_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, // NOTE TO MYSELF: Do we really need all/any non-gtkOptions, i.e. override mplayer options? - { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "stopxscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "stopxscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "dvd_device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "dvd_device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, + { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, - { "vo_driver", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, - { "v_vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "vo_driver", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "v_vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, - { "vf_autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL }, - { "vo_direct_render", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "vo_doublebuffering", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "vo_panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL }, + { "vf_autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL }, + { "vo_direct_render", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "vo_doublebuffering", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "vo_panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL }, - { "v_flip", &flip, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL }, - { "v_framedrop", &frame_dropping, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL }, - { "v_idx", &index_mode, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL }, - { "v_ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "v_flip", &flip, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL }, + { "v_framedrop", &frame_dropping, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL }, + { "v_idx", &index_mode, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL }, + { "v_ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ao_driver", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, - { "a_afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "ao_driver", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "a_afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, - { "softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "sub_auto_load", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "sub_auto_load", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL }, #ifdef CONFIG_ICONV - { "sub_cp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "sub_cp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL }, #endif - { "sub_overlap", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, NULL }, - { "sub_pos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL }, - { "sub_unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "sub_overlap", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, NULL }, + { "sub_pos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL }, + { "sub_unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "font_factor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL }, - { "font_name", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "font_factor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL }, + { "font_name", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL }, #ifdef CONFIG_FREETYPE - { "font_encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "font_text_scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL }, - { "font_osd_scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL }, - { "font_blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL }, - { "font_outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL }, - { "font_autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, + { "font_encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "font_text_scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL }, + { "font_osd_scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL }, + { "font_blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL }, + { "font_outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL }, + { "font_autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, #endif #ifdef CONFIG_ASS - { "ass_enabled", &ass_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ass_use_margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ass_top_margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL }, - { "ass_bottom_margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL }, + { "ass_enabled", &ass_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "ass_use_margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "ass_top_margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL }, + { "ass_bottom_margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL }, #endif - { NULL, NULL, 0, 0, 0, 0, NULL } + { NULL, NULL, 0, 0, 0, 0, NULL } }; static char *gfgets(char *str, int size, FILE *f) Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Thu May 5 13:13:33 2011 (r33375) +++ trunk/gui/interface.c Thu May 5 13:56:34 2011 (r33376) @@ -410,13 +410,13 @@ void guiDone(void) } // NOTE TO MYSELF: Before calling guiInit(), MPlayer calls GUI functions -// cfg_read() and import_initial_playtree_into_gui(). Only -// after guiInit() has been called successfully, guiDone() -// (and thus guiExit()) will be executed by MPlayer on exit. -// In other words, any MPlayer's exit between cfg_read() and -// guiInit() will not execute guiDone(). -// With this function it is at least possible to handle -// GUI's own abortions during (and before) guiInit(). +// cfg_read() and import_initial_playtree_into_gui(). Only +// after guiInit() has been called successfully, guiDone() +// (and thus guiExit()) will be executed by MPlayer on exit. +// In other words, any MPlayer's exit between cfg_read() and +// guiInit() will not execute guiDone(). +// With this function it is at least possible to handle +// GUI's own abortions during (and before) guiInit(). void guiExit(int how) { if (!initialized || (how == DONE)) { @@ -1489,12 +1489,12 @@ int import_playtree_playlist_into_gui(pl } // NOTE TO MYSELF: This function is nonsense. -// MPlayer should pass messages to the GUI -// which must decide then which message has -// to be shown (MSGL_FATAL, for example). -// But with this function it is at least -// possible to show GUI's very critical or -// abort messages. +// MPlayer should pass messages to the GUI +// which must decide then which message has +// to be shown (MSGL_FATAL, for example). +// But with this function it is at least +// possible to show GUI's very critical or +// abort messages. void gmp_msg(int mod, int lev, const char *format, ...) { char msg[512];

3 2

r33375 - trunk/TOOLS/mp-uncrustify-style.cfg
by cboesch 05 May '11

05 May '11

Author: cboesch Date: Thu May 5 13:13:33 2011 New Revision: 33375 Log: Do not prefer '// A' over '//A' in uncrustify profile. This tends to break Doxygen comments. Modified: trunk/TOOLS/mp-uncrustify-style.cfg Modified: trunk/TOOLS/mp-uncrustify-style.cfg ============================================================================== --- trunk/TOOLS/mp-uncrustify-style.cfg Thu May 5 12:29:08 2011 (r33374) +++ trunk/TOOLS/mp-uncrustify-style.cfg Thu May 5 13:13:33 2011 (r33375) @@ -606,7 +606,7 @@ sp_case_label sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' -sp_cmt_cpp_start = force # ignore/add/remove/force +sp_cmt_cpp_start = ignore # ignore/add/remove/force # Controls the spaces between #else or #endif and a trailing comment sp_endif_cmt = ignore # ignore/add/remove/force

3 2

r33381 - trunk/TOOLS/mp-uncrustify-style.cfg
by cboesch 05 May '11

05 May '11

Author: cboesch Date: Thu May 5 18:54:17 2011 New Revision: 33381 Log: Add note about sp_cmt_cpp_start uncrustify setting. Modified: trunk/TOOLS/mp-uncrustify-style.cfg Modified: trunk/TOOLS/mp-uncrustify-style.cfg ============================================================================== --- trunk/TOOLS/mp-uncrustify-style.cfg Thu May 5 18:50:38 2011 (r33380) +++ trunk/TOOLS/mp-uncrustify-style.cfg Thu May 5 18:54:17 2011 (r33381) @@ -606,6 +606,7 @@ sp_case_label sp_range = ignore # ignore/add/remove/force # Control the space after the opening of a C++ comment '// A' vs '//A' +# MPlayer devs note: we ignore the following setting because it breaks Doxygen comments sp_cmt_cpp_start = ignore # ignore/add/remove/force # Controls the spaces between #else or #endif and a trailing comment

1 0