Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv20149/main/libvo Modified Files: vosub_vidix.c vosub_vidix.h Log Message: Using any graphics server Index: vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vosub_vidix.c 7 Jan 2002 10:54:00 -0000 1.5 +++ vosub_vidix.c 10 Jan 2002 18:00:23 -0000 1.6 @@ -47,7 +47,7 @@ extern vo_functions_t video_out_vesa; -int vidix_preinit(const char *drvname) +int vidix_preinit(const char *drvname,void *server) { int err; if(verbose > 1) printf("vosub_vidix: vidix_preinit(%s) was called\n",drvname); @@ -72,10 +72,10 @@ } printf("vosub_vidix: Using: %s\n",vidix_cap.name); /* we are able to tune up this stuff depend on fourcc format */ - video_out_vesa.draw_slice=vidix_draw_slice; - video_out_vesa.draw_frame=vidix_draw_frame; - video_out_vesa.flip_page=vidix_flip_page; - video_out_vesa.draw_osd=vidix_draw_osd; + ((vo_functions_t *)server)->draw_slice=vidix_draw_slice; + ((vo_functions_t *)server)->draw_frame=vidix_draw_frame; + ((vo_functions_t *)server)->flip_page=vidix_flip_page; + ((vo_functions_t *)server)->draw_osd=vidix_draw_osd; return 0; } @@ -86,7 +86,12 @@ { size_t i,awidth; int err; - if(verbose > 1) printf("vosub_vidix: vidix_init() was called\n"); + if(verbose > 1) + printf("vosub_vidix: vidix_init() was called\n" + "src_w=%u src_h=%u dest_x_y_w_h = %u %u %u %u\n" + "format=%s dest_bpp=%u vid_w=%u vid_h=%u\n" + ,src_width,src_height,x_org,y_org,dst_width,dst_height + ,vo_format_name(format),dest_bpp,vid_w,vid_h); if(vid_w > vidix_cap.maxwidth || vid_w < vidix_cap.minwidth || vid_h > vidix_cap.maxheight || vid_h < vidix_cap.minheight) { Index: vosub_vidix.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vosub_vidix.h 6 Jan 2002 16:02:24 -0000 1.1 +++ vosub_vidix.h 10 Jan 2002 18:00:23 -0000 1.2 @@ -13,7 +13,7 @@ #define __VOSUB_VIDIX_INCLUDED /* drvname can be NULL */ -int vidix_preinit( const char *drvname); +int vidix_preinit( const char *drvname,void *server); int vidix_init(unsigned src_width,unsigned src_height, unsigned dest_x,unsigned dest_y,unsigned dst_width, unsigned dst_height,unsigned format,unsigned dest_bpp,