diff options
author | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-24 04:23:53 +0000 |
---|---|---|
committer | reynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-24 04:23:53 +0000 |
commit | 78417bf0ddb3e5711e6cc22ed98ed095286a0ece (patch) | |
tree | f7c5c3ca1c7ac07e6da82b70e3e1ce62e807a787 /libvo/vesa_lvo.c | |
parent | 141b72fe05ec33239e1be6ff6ce064a67440fb8f (diff) | |
download | mpv-78417bf0ddb3e5711e6cc22ed98ed095286a0ece.tar.bz2 mpv-78417bf0ddb3e5711e6cc22ed98ed095286a0ece.tar.xz |
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18235 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vesa_lvo.c')
-rw-r--r-- | libvo/vesa_lvo.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c index b108bfbfac..844c737679 100644 --- a/libvo/vesa_lvo.c +++ b/libvo/vesa_lvo.c @@ -21,6 +21,7 @@ #include "config.h" #include "mp_msg.h" +#include "help_mp.h" #include "vesa_lvo.h" #include "img_format.h" @@ -51,15 +52,14 @@ extern vo_functions_t video_out_vesa; int vlvo_preinit(const char *drvname) { - printf("vesa_lvo: This branch is no longer supported.\n" - "vesa_lvo: Please use -vo vesa:vidix instead\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported); return -1; if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { - printf("vesa_lvo: vlvo_preinit(%s) was called\n",drvname); } + mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_preinit(%s) was called\n",drvname);} lvo_handler = open(drvname,O_RDWR); if(lvo_handler == -1) { - printf("vesa_lvo: Couldn't open '%s'\n",drvname); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_CouldntOpen,drvname); return -1; } /* we are able to tune up this stuff depend on fourcc format */ @@ -76,11 +76,10 @@ int vlvo_init(unsigned src_width,unsigned src_height, unsigned dst_height,unsigned format,unsigned dest_bpp) { size_t i,awidth; - printf("vesa_lvo: This branch is no longer supported.\n" - "vesa_lvo: Please use -vo vesa:vidix instead\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported); return -1; if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { - printf("vesa_lvo: vlvo_init() was called\n"); } + mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_init() was called\n");} image_width = src_width; image_height = src_height; mga_vid_config.version=MGA_VID_VERSION; @@ -116,7 +115,7 @@ int vlvo_init(unsigned src_width,unsigned src_height, mga_vid_config.frame_size = awidth*src_height*4; break; default: - printf("vesa_lvo: invalid output format %s(%0X)\n",vo_format_name(format),format); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_InvalidOutputFormat,vo_format_name(format),format); return -1; } mga_vid_config.colkey_on=0; @@ -130,7 +129,7 @@ int vlvo_init(unsigned src_width,unsigned src_height, if (ioctl(lvo_handler,MGA_VID_CONFIG,&mga_vid_config)) { perror("vesa_lvo: Error in mga_vid_config ioctl()"); - printf("vesa_lvo: Your fb_vid driver version is incompatible with this MPlayer version!\n"); + mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_IncompatibleDriverVersion); return -1; } ioctl(lvo_handler,MGA_VID_ON,0); @@ -149,7 +148,7 @@ int vlvo_init(unsigned src_width,unsigned src_height, void vlvo_term( void ) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { - printf("vesa_lvo: vlvo_term() was called\n"); } + mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_term() was called\n");} ioctl( lvo_handler,MGA_VID_OFF,0 ); munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames); if(lvo_handler != -1) close(lvo_handler); @@ -198,7 +197,7 @@ uint32_t vlvo_draw_slice_420(uint8_t *image[], int stride[], int w,int h,int x,i uint32_t vlvo_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { - printf("vesa_lvo: vlvo_draw_slice() was called\n"); } + mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_draw_slice() was called\n");} if(src_format == IMGFMT_YV12 || src_format == IMGFMT_I420 || src_format == IMGFMT_IYUV) vlvo_draw_slice_420(image,stride,w,h,x,y); else @@ -218,14 +217,14 @@ uint32_t vlvo_draw_frame(uint8_t *image[]) /* Note it's very strange but sometime for YUY2 draw_frame is called */ memcpy(lvo_mem,image[0],mga_vid_config.frame_size); if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { - printf("vesa_lvo: vlvo_draw_frame() was called\n"); } + mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_flip_page() was called\n");} return 0; } void vlvo_flip_page(void) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { - printf("vesa_lvo: vlvo_flip_page() was called\n"); } + mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_draw_osd() was called\n");} if(vo_doublebuffering) { ioctl(lvo_handler,MGA_VID_FSEL,&next_frame); @@ -284,7 +283,7 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned void vlvo_draw_osd(void) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { - printf("vesa_lvo: vlvo_draw_osd() was called\n"); } + mp_msg(MSGT_VO,MSGL_DBG2,"vesa_lvo: vlvo_draw_osd() was called\n"); } /* TODO: hw support */ #if 0 /* disable this stuff until new fbvid.h interface will be implemented @@ -297,7 +296,7 @@ void vlvo_draw_osd(void) uint32_t vlvo_query_info(uint32_t format) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { - printf("vesa_lvo: query_format was called: %x (%s)\n",format,vo_format_name(format)); } + mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: query_format was called: %x (%s)\n",format,vo_format_name(format)); } return VFCAP_CSP_SUPPORTED; } |