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

r33412 - trunk/libvo/vo_x11.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 21:52:22 2011 New Revision: 33412 Log: Remove unused variables and code initializing them. Modified: trunk/libvo/vo_x11.c Modified: trunk/libvo/vo_x11.c ============================================================================== --- trunk/libvo/vo_x11.c Sat May 7 21:49:26 2011 (r33411) +++ trunk/libvo/vo_x11.c Sat May 7 21:52:22 2011 (r33412) @@ -310,10 +310,7 @@ static int config(uint32_t width, uint32 // int screen; // int interval, prefer_blank, allow_exp, nothing; - unsigned int fg, bg; Colormap theCmap; - XSetWindowAttributes xswa; - unsigned long xswamask; const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt; #ifdef CONFIG_XF86VM @@ -360,24 +357,9 @@ static int config(uint32_t width, uint32 vo_vm_switch(); } #endif - bg = WhitePixel(mDisplay, mScreen); - fg = BlackPixel(mDisplay, mScreen); theCmap = vo_x11_create_colormap(&vinfo); - xswa.background_pixel = 0; - xswa.border_pixel = 0; - xswa.colormap = theCmap; - xswamask = CWBackPixel | CWBorderPixel | CWColormap; - -#ifdef CONFIG_XF86VM - if (vm) - { - xswa.override_redirect = True; - xswamask |= CWOverrideRedirect; - } -#endif - vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, vo_dwidth, vo_dheight, flags, theCmap, "x11", title); if (WinID > 0)

1 0

r33411 - trunk/vidix/mga_vid.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 21:49:26 2011 New Revision: 33411 Log: Simplify macros and get rid of incorrect casts from pointers to uint32_t. Fixes also a huge amount of compiler warnings. Modified: trunk/vidix/mga_vid.c Modified: trunk/vidix/mga_vid.c ============================================================================== --- trunk/vidix/mga_vid.c Sat May 7 21:44:05 2011 (r33410) +++ trunk/vidix/mga_vid.c Sat May 7 21:49:26 2011 (r33411) @@ -67,14 +67,13 @@ #define ENOTSUP EOPNOTSUPP #endif -/* from radeon_vid */ -#define GETREG(TYPE,PTR,OFFZ) (*((volatile TYPE*)((PTR)+(OFFZ)))) -#define SETREG(TYPE,PTR,OFFZ,VAL) (*((volatile TYPE*)((PTR)+(OFFZ))))=VAL +#define GETREG(TYPE,PTR) (*(volatile TYPE*)(PTR)) +#define SETREG(TYPE,PTR,VAL) (*(volatile TYPE*)(PTR))=VAL -#define readb(addr) GETREG(uint8_t,(uint32_t)(addr),0) -#define writeb(val,addr) SETREG(uint8_t,(uint32_t)(addr),0,val) -#define readl(addr) GETREG(uint32_t,(uint32_t)(addr),0) -#define writel(val,addr) SETREG(uint32_t,(uint32_t)(addr),0,val) +#define readb(addr) GETREG(uint8_t,addr) +#define writeb(val,addr) SETREG(uint8_t,addr,val) +#define readl(addr) GETREG(uint32_t,addr) +#define writel(val,addr) SETREG(uint32_t,addr,val) static int mga_verbose = 0;

1 0

r33410 - trunk/vidix/mach64_vid.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 21:44:05 2011 New Revision: 33410 Log: Remove unused variables. Modified: trunk/vidix/mach64_vid.c Modified: trunk/vidix/mach64_vid.c ============================================================================== --- trunk/vidix/mach64_vid.c Sat May 7 21:41:42 2011 (r33409) +++ trunk/vidix/mach64_vid.c Sat May 7 21:44:05 2011 (r33410) @@ -642,7 +642,6 @@ static void mach64_vid_stop_video( void static void mach64_vid_display_video( void ) { - uint32_t vf; mach64_fifo_wait(14); OUTREG(OVERLAY_Y_X_START, besr.y_x_start); @@ -672,7 +671,7 @@ static void mach64_vid_display_video( vo // bit 28-31 nothing interresting just crashed my system when i played with them :( mach64_wait_for_idle(); - vf = INREG(VIDEO_FORMAT); + INREG(VIDEO_FORMAT); // Bits 16-19 seem to select the format // 0x0 dunno behaves strange @@ -718,7 +717,7 @@ static void mach64_vid_display_video( vo static int mach64_vid_init_video( vidix_playback_t *config ) { - uint32_t src_w,src_h,dest_w,dest_h,pitch,h_inc,v_inc,left,leftUV,top,ecp,y_pos; + uint32_t src_w,src_h,dest_w,dest_h,pitch,h_inc,v_inc,left,top,ecp,y_pos; int is_420,best_pitch,mpitch; int src_offset_y, src_offset_u, src_offset_v; unsigned int i; @@ -837,7 +836,6 @@ static int mach64_vid_init_video( vidix_ mach64_buffer_base[i][2]= (mach64_overlay_offset + config->offsets[i] + src_offset_v)&~15; } - leftUV = (left >> 17) & 15; left = (left >> 16) & 15; besr.scale_inc = ( h_inc << 16 ) | v_inc; y_pos = config->dest.y;

1 0

r33408 - trunk/libvo/vosub_vidix.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 21:39:51 2011 New Revision: 33408 Log: Fix draw_frame/draw_slice return types. Fixes "assignment from incompatible pointer type" warnings and also the previous unsigned type was rather stupid since several functions return -1. Modified: trunk/libvo/vosub_vidix.c Modified: trunk/libvo/vosub_vidix.c ============================================================================== --- trunk/libvo/vosub_vidix.c Sat May 7 21:20:40 2011 (r33407) +++ trunk/libvo/vosub_vidix.c Sat May 7 21:39:51 2011 (r33408) @@ -97,7 +97,7 @@ void vidix_term( void ) // vo_server->control=server_control; } -static uint32_t vidix_draw_slice_420(uint8_t *image[], int stride[], int w,int h,int x,int y) +static int vidix_draw_slice_420(uint8_t *image[], int stride[], int w,int h,int x,int y) { uint8_t *src; uint8_t *dest; @@ -161,7 +161,7 @@ static uint32_t vidix_draw_slice_420(uin return -1; } -static uint32_t vidix_draw_slice_410(uint8_t *image[], int stride[], int w,int h,int x,int y) +static int vidix_draw_slice_410(uint8_t *image[], int stride[], int w,int h,int x,int y) { uint8_t *src; uint8_t *dest; @@ -207,7 +207,7 @@ static uint32_t vidix_draw_slice_410(uin return -1; } -static uint32_t vidix_draw_slice_packed(uint8_t *image[], int stride[], int w,int h,int x,int y) +static int vidix_draw_slice_packed(uint8_t *image[], int stride[], int w,int h,int x,int y) { uint8_t *src; uint8_t *dest; @@ -224,7 +224,7 @@ static uint32_t vidix_draw_slice_packed( return 0; } -static uint32_t vidix_draw_slice_nv12(uint8_t *image[], int stride[], int w,int h,int x,int y) +static int vidix_draw_slice_nv12(uint8_t *image[], int stride[], int w,int h,int x,int y) { uint8_t *src; uint8_t *dest; @@ -252,7 +252,7 @@ static uint32_t vidix_draw_slice_nv12(ui return 0; } -static uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) +static int vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) { mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawsliceWasCalled); return -1; @@ -270,7 +270,7 @@ static uint32_t vidix_draw_image(mp_ima return VO_TRUE; } -static uint32_t vidix_draw_frame(uint8_t *image[]) +static int vidix_draw_frame(uint8_t *image[]) { mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawframeWasCalled); return -1;

1 0

r33407 - trunk/libvo/vo_vdpau.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 21:20:40 2011 New Revision: 33407 Log: Another equalizer-related const-warning fix. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Sat May 7 21:19:35 2011 (r33406) +++ trunk/libvo/vo_vdpau.c Sat May 7 21:20:40 2011 (r33407) @@ -1283,7 +1283,7 @@ static int preinit(const char *arg) return 0; } -static int get_equalizer(char *name, int *value) +static int get_equalizer(const char *name, int *value) { if (!strcasecmp(name, "brightness")) *value = procamp.brightness * 100; @@ -1298,7 +1298,7 @@ static int get_equalizer(char *name, int return VO_TRUE; } -static int set_equalizer(char *name, int value) +static int set_equalizer(const char *name, int value) { if (!strcasecmp(name, "brightness")) procamp.brightness = value / 100.0;

1 0

r33406 - in trunk/libvo: vo_v4l2.c vo_v4l2.h
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 21:19:35 2011 New Revision: 33406 Log: Fix function to match what send_mpeg_pes_packet expects, thus eliminating compiler warnings. Modified: trunk/libvo/vo_v4l2.c trunk/libvo/vo_v4l2.h Modified: trunk/libvo/vo_v4l2.c ============================================================================== --- trunk/libvo/vo_v4l2.c Sat May 7 21:17:04 2011 (r33405) +++ trunk/libvo/vo_v4l2.c Sat May 7 21:19:35 2011 (r33406) @@ -70,7 +70,7 @@ static const vo_info_t info = const LIBVO_EXTERN (v4l2) int -v4l2_write (unsigned char *data, int len) +v4l2_write (const unsigned char *data, int len) { if (v4l2_fd < 0) return 0; Modified: trunk/libvo/vo_v4l2.h ============================================================================== --- trunk/libvo/vo_v4l2.h Sat May 7 21:17:04 2011 (r33405) +++ trunk/libvo/vo_v4l2.h Sat May 7 21:19:35 2011 (r33406) @@ -25,6 +25,6 @@ extern int v4l2_fd; -int v4l2_write (unsigned char *data, int len); +int v4l2_write (const unsigned char *data, int len); #endif /* MPLAYER_VO_V4L2_H */

1 0

r33405 - trunk/libvo/vo_sdl.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 21:17:04 2011 New Revision: 33405 Log: Fix strict-aliasing violation warnings. Modified: trunk/libvo/vo_sdl.c Modified: trunk/libvo/vo_sdl.c ============================================================================== --- trunk/libvo/vo_sdl.c Sat May 7 21:09:13 2011 (r33404) +++ trunk/libvo/vo_sdl.c Sat May 7 21:17:04 2011 (r33405) @@ -1187,12 +1187,12 @@ static void erase_rectangle(int x, int y case IMGFMT_YVYU: { /* yuy2 and yvyu represent black the same way */ - uint8_t yuy2_black[] = {0, 128, 0, 128}; + uint32_t yuy2_black = HAVE_BIGENDIAN ? 0x00800080 : 0x80008000; SDL_OVR_LOCK((void) 0) erase_area_4(x*2, w*2, h, priv->overlay->pitches[0], - *((uint32_t*) yuy2_black), + yuy2_black, priv->overlay->pixels[0] + priv->overlay->pitches[0]*y); SDL_OVR_UNLOCK @@ -1201,12 +1201,12 @@ static void erase_rectangle(int x, int y case IMGFMT_UYVY: { - uint8_t uyvy_black[] = {128, 0, 128, 0}; + uint32_t uyvy_black = HAVE_BIGENDIAN ? 0x80008000 : 0x00800080; SDL_OVR_LOCK((void) 0) erase_area_4(x*2, w*2, h, priv->overlay->pitches[0], - *((uint32_t*) uyvy_black), + uyvy_black, priv->overlay->pixels[0] + priv->overlay->pitches[0]*y); SDL_OVR_UNLOCK

1 0

r33404 - trunk/libmenu/menu_filesel.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 21:09:13 2011 New Revision: 33404 Log: Remove variable and code that was obviously forgotten when the replace_path function was introduced. Fixes a compiler warning about a variable that is set but never used. Modified: trunk/libmenu/menu_filesel.c Modified: trunk/libmenu/menu_filesel.c ============================================================================== --- trunk/libmenu/menu_filesel.c Sat May 7 21:06:26 2011 (r33403) +++ trunk/libmenu/menu_filesel.c Sat May 7 21:09:13 2011 (r33404) @@ -233,7 +233,6 @@ static int open_dir(menu_t* menu,char* a struct stat st; int n; int path_fp; - char* p = NULL; list_entry_t* e; DIR* dirp; char **extensions, **elem, *ext; @@ -244,7 +243,6 @@ static int open_dir(menu_t* menu,char* a mpriv->dir = strdup(args); if(mpriv->p.title && mpriv->p.title != mpriv->title && mpriv->p.title != cfg_dflt.p.title) free(mpriv->p.title); - p = strstr(mpriv->title,"%p"); mpriv->p.title = replace_path(mpriv->title,mpriv->dir,0);

1 0

r33402 - trunk/gui/wm/ws.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 20:59:15 2011 New Revision: 33402 Log: Remove code with no purpose. Also fixes compiler warning about variable that is assigned but never used. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Sat May 7 20:53:48 2011 (r33401) +++ trunk/gui/wm/ws.c Sat May 7 20:59:15 2011 (r33402) @@ -1118,10 +1118,8 @@ void wsDestroyImage( wsTWindow * win ) void wsCreateImage( wsTWindow * win,int Width,int Height ) { - int CompletionType = -1; if ( wsUseXShm ) { - CompletionType=XShmGetEventBase( wsDisplay ) + ShmCompletion; win->xImage=XShmCreateImage( wsDisplay,win->VisualInfo.visual, win->VisualInfo.depth,ZPixmap,NULL,&win->Shminfo,Width,Height ); if ( win->xImage == NULL )

1 0

r33401 - trunk/gui/mplayer/widgets.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 20:53:48 2011 New Revision: 33401 Log: Remove unused variable. Modified: trunk/gui/mplayer/widgets.c Modified: trunk/gui/mplayer/widgets.c ============================================================================== --- trunk/gui/mplayer/widgets.c Sat May 7 20:48:31 2011 (r33400) +++ trunk/gui/mplayer/widgets.c Sat May 7 20:53:48 2011 (r33401) @@ -105,9 +105,9 @@ void gtkClearList( GtkWidget * list ) int gtkFindCList( GtkWidget * list,char * item ) { - gint j,t; + gint j; gchar * tmpstr; - for( t=0,j=0;j<GTK_CLIST( list )->rows;j++ ) + for( j=0;j<GTK_CLIST( list )->rows;j++ ) { gtk_clist_get_text( GTK_CLIST( list ),j,0,&tmpstr ); if ( !strcmp( tmpstr,item ) ) return j;

1 0