diff options
| author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-10 18:00:23 +0000 |
|---|---|---|
| committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-10 18:00:23 +0000 |
| commit | 2707db756b2c34da0dd44ebc0af3af50813c8095 (patch) | |
| tree | d866da92c671d2481cd1eb60ff58f88b4b6f5e8d | |
| parent | 4d08add9a213f77163320eecaa485d1007402d89 (diff) | |
| download | mpv-2707db756b2c34da0dd44ebc0af3af50813c8095.tar.bz2 mpv-2707db756b2c34da0dd44ebc0af3af50813c8095.tar.xz | |
Using any graphics server
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4083 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libvo/vosub_vidix.c | 17 | ||||
| -rw-r--r-- | libvo/vosub_vidix.h | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index c5fb01e1c7..076eede950 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -47,7 +47,7 @@ static vidix_fourcc_t vidix_fourcc; 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 @@ int vidix_preinit(const char *drvname) } 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 @@ int vidix_init(unsigned src_width,unsigned src_height, { 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) { diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h index d381a64f93..1a6d3e013e 100644 --- a/libvo/vosub_vidix.h +++ b/libvo/vosub_vidix.h @@ -14,7 +14,7 @@ /* drvname can be NULL */ int vidix_preinit( -const char *drvname); +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, |