[MPlayer-cvslog] CVS: main/libvo vo_s3fb.c,1.3,1.4

[Ivo van Poorten CVS]

CVS change done by Ivo van Poorten CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv1988

Modified Files:
	vo_s3fb.c 
Log Message:
use mp_msg instead of printf
messages have to be moved to help_mp-en.h later



Index: vo_s3fb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_s3fb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vo_s3fb.c	18 May 2006 09:54:44 -0000	1.3
+++ vo_s3fb.c	18 May 2006 10:08:38 -0000	1.4
@@ -22,6 +22,7 @@
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
+#include "mp_msg.h"
 #include "fastmemcpy.h"
 #include "video_out.h"
 #include "video_out_internal.h"
@@ -225,12 +226,12 @@
     name = "/dev/fb0";
 
   if((fd = open(name, O_RDWR)) == -1) {
-    printf("s3fb: can't open %s: %s\n", name, strerror(errno));
+    mp_msg(MSGT_VO, MSGL_FATAL, "s3fb: can't open %s: %s\n", name, strerror(errno));
     return -1;
   }
 
   if(ioctl(fd, FBIOGET_FSCREENINFO, &fb_finfo)) {
-    printf("s3fb: problem with FBITGET_FSCREENINFO ioctl: %s\n",
+    mp_msg(MSGT_VO, MSGL_FATAL, "s3fb: problem with FBITGET_FSCREENINFO ioctl: %s\n",
            strerror(errno));
     close(fd);
     fd = -1;
@@ -238,7 +239,7 @@
   }
 
   if(ioctl(fd, FBIOGET_VSCREENINFO, &fb_vinfo)) {
-    printf("s3fb: problem with FBITGET_VSCREENINFO ioctl: %s\n",
+    mp_msg(MSGT_VO, MSGL_FATAL, "s3fb: problem with FBITGET_VSCREENINFO ioctl: %s\n",
            strerror(errno));
     close(fd);
     fd = -1;
@@ -252,7 +253,7 @@
   case 32:
     break; // Ok
   default:
-    printf("s3fb: %d bpp output is not supported\n", fb_vinfo.bits_per_pixel);
+    mp_msg(MSGT_VO, MSGL_FATAL, "s3fb: %d bpp output is not supported\n", fb_vinfo.bits_per_pixel);
     close(fd);
     fd = -1;
     return -1;
@@ -263,7 +264,7 @@
   sreg = fb_finfo.smem_start;
 
   if((long)smem == -1) {
-    printf("s3fb: Couldn't map memory areas: %s\n", strerror(errno));
+    mp_msg(MSGT_VO, MSGL_FATAL, "s3fb: Couldn't map memory areas: %s\n", strerror(errno));
     if((long)smem != -1)
       munmap(smem, fb_finfo.smem_len);
     smem = NULL;
@@ -337,7 +338,7 @@
   inpageoffset = yuv_on(in_s3_format, in_width, in_height, vidx, vidy, vidwidth, vidheight, 0, screenwidth, screenheight, screenstride, 0);
   inpage0 = smem + inpageoffset;
   inpage = inpage0;
-  printf("s3fb: output is at %dx%d +%dx%d\n", vidx, vidy, vidwidth, vidheight);
+  mp_msg(MSGT_VO, MSGL_INFO, "s3fb: output is at %dx%d +%dx%d\n", vidx, vidy, vidwidth, vidheight);
    
   clear_screen();
 }
@@ -393,7 +394,7 @@
     break;
 
   default:
-    printf("s3fb: Eik! Something's wrong with control().\n");
+    mp_msg(MSGT_VO, MSGL_FATAL, "s3fb: Eik! Something's wrong with control().\n");
     return -1;
   }
    
@@ -404,7 +405,7 @@
     page = 0;
    
   if(screenheight * screenstride + page + offset > fb_finfo.smem_len) {
-    printf("s3fb: Not enough video memory to play this movie. Try at a lower resolution\n");
+    mp_msg(MSGT_VO, MSGL_FATAL, "s3fb: Not enough video memory to play this movie. Try at a lower resolution\n");
     return -1;
   }
 
@@ -412,7 +413,7 @@
   if (vo_doublebuffering)
     inpage = inpage0 + page;
       
-  printf("s3fb: screen is %dx%d at %d bpp, in is %dx%d at %d bpp, norm is %dx%d\n",
+  mp_msg(MSGT_VO, MSGL_INFO, "s3fb: screen is %dx%d at %d bpp, in is %dx%d at %d bpp, norm is %dx%d\n",
          screenwidth, screenheight, screendepth * 8,
          in_width, in_height, in_depth * 8,
          d_width, d_height);