msg/i18n fixes and some printf->mp_msg

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6297 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 30 insertions, 32 deletions

diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 90ed5acbd9..5e5fce7ee6 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -29,6 +29,8 @@
 #include <string.h>
 
 #include "config.h"
+#include "mp_msg.h"
+
 #include "video_out.h"
 #include "video_out_internal.h"
 
@@ -106,10 +108,10 @@ static void set_window(){
 	 if ( WinID )
 	  {
            XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
-           fprintf( stderr,"[xmga] x: %d y: %d w: %d h: %d\n",drwX,drwY,drwWidth,drwHeight );
+           mp_msg(MSGT_VO,MSGL_V,"[xmga] x: %d y: %d w: %d h: %d\n",drwX,drwY,drwWidth,drwHeight );
            drwX=0; drwY=0;
            XTranslateCoordinates( mDisplay,vo_window,mRoot,0,0,&drwcX,&drwcY,&mRoot );
-           fprintf( stderr,"[xmga] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
+           mp_msg(MSGT_VO,MSGL_V,"[xmga] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
 	  }
 	  else { drwX=drwcX=vo_dx; drwY=drwcY=vo_dy; drwWidth=vo_dwidth; drwHeight=vo_dheight; }
 
@@ -123,7 +125,7 @@ static void set_window(){
            drwcY+=drwY;
            drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
            drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
-           fprintf( stderr,"[xmga-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
+           mp_msg(MSGT_VO,MSGL_V,"[xmga-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
           }
 
          mDrawColorKey();
@@ -166,7 +168,7 @@ static void check_events(void)
  if ( !(e&VO_EVENT_RESIZE) && !(e&VO_EVENT_EXPOSE) ) return;
  set_window();
  mDrawColorKey();
- if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) ) printf( "Error in mga_vid_config ioctl (wrong mga_vid.o version?)" );
+ if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) ) mp_msg(MSGT_VO,MSGL_WARN,"Error in mga_vid_config ioctl (wrong mga_vid.o version?)" );
 }
 
 static void draw_osd(void)
@@ -176,7 +178,7 @@ static void flip_page(void){
 #ifdef SHOW_TIME
     unsigned int t;
     t=GetTimer();
-    printf("  [timer: %08X  diff: %6d  dd: %6d ]  \n",t,t-timer,(t-timer)-timerd);
+    mp_msg(MSGT_VO,MSGL_STATUS,"  [timer: %08X  diff: %6d  dd: %6d ]  \n",t,t-timer,(t-timer)-timerd);
     timerd=t-timer;
     timer=t;
 #endif
@@ -218,7 +220,9 @@ static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint3
         mga_vid_config.format=MGA_VID_FORMAT_UYVY;
         mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
         break;
-   default:          printf("mga: invalid output format %0X\n",format); return (-1);
+   default:
+       mp_msg(MSGT_VO,MSGL_ERR,"mga: invalid output format %0X\n",format);
+       return -1;
   }
 
  aspect_save_orig(width,height);
@@ -237,7 +241,7 @@ static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint3
    case 24: fgColor=0x00ff00ffL; break;
    case 16: fgColor=0xf81fL; break;
    case 15: fgColor=0x7c1fL; break;
-   default: printf( "Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
+   default: mp_msg(MSGT_VO,MSGL_ERR,"Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
   }
 
   inited=1;
@@ -335,6 +339,6 @@ uninit(void)
  mga_uninit();
  saver_on(mDisplay);
  vo_x11_uninit();
- printf("vo: uninit!\n");
+ mp_msg(MSGT_VO,MSGL_V,"vo: uninit!\n");
 }
 
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 769f207261..a39a0e319d 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -128,8 +128,7 @@ int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return)
 			   &nvisuals);
   if (visuals != NULL) {
     for (i = 0; i < nvisuals; i++) {
-      if (verbose)
-	printf("vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n",
+      mp_msg(MSGT_VO,MSGL_V,"vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n",
 	       visuals[i].visualid, visuals[i].depth,
 	       visuals[i].red_mask, visuals[i].green_mask,
 	       visuals[i].blue_mask);
@@ -163,15 +162,12 @@ static int x11_errorhandler(Display *display, XErrorEvent *event)
         
     XGetErrorText(display, event->error_code, (char *)&msg, MSGLEN);
     
-    printf("X11 error: %s\n", msg);
+    mp_msg(MSGT_VO,MSGL_ERR,"X11 error: %s\n", msg);
     
-    if (verbose)
-    {
-	printf("Type: %x, display: %x, resourceid: %x, serial: %x\n",
+    mp_msg(MSGT_VO,MSGL_V,"Type: %x, display: %x, resourceid: %x, serial: %x\n",
 	    event->type, event->display, event->resourceid, event->serial);
-	printf("Error code: %x, request code: %x, minor code: %x\n",
+    mp_msg(MSGT_VO,MSGL_V,"Error code: %x, request code: %x, minor code: %x\n",
 	    event->error_code, event->request_code, event->minor_code);
-    }
     
     abort();
     //exit_player("X11 error");
@@ -267,13 +263,12 @@ int vo_init( void )
   dispName = XDisplayName(mDisplayName);
 #endif
 
- if (verbose)
-    printf("X11 opening display: %s\n", dispName);
+ mp_msg(MSGT_VO,MSGL_V,"X11 opening display: %s\n", dispName);
 
  mDisplay=XOpenDisplay(dispName);
  if ( !mDisplay )
   {
-   printf( "vo: couldn't open the X11 display (%s)!\n",dispName );
+   mp_msg(MSGT_VO,MSGL_ERR,"vo: couldn't open the X11 display (%s)!\n",dispName );
    return 0;
   }
  mScreen=DefaultScreen( mDisplay );     // Screen ID.
@@ -345,8 +340,7 @@ int vo_init( void )
    bpp=mXImage->bits_per_pixel;
    if((vo_depthonscreen+7)/8 != (bpp+7)/8) vo_depthonscreen=bpp; // by A'rpi
    mask=mXImage->red_mask|mXImage->green_mask|mXImage->blue_mask;
-   if(verbose)
-     printf("vo: X11 color mask:  %X  (R:%lX G:%lX B:%lX)\n",
+   mp_msg(MSGT_VO,MSGL_V,"vo: X11 color mask:  %X  (R:%lX G:%lX B:%lX)\n",
 	    mask,mXImage->red_mask,mXImage->green_mask,mXImage->blue_mask);
    XDestroyImage( mXImage );
  }
@@ -361,7 +355,7 @@ int vo_init( void )
  else if ( strncmp(dispName, "localhost:", 10) == 0)
 		dispName += 9;
  if (*dispName==':') mLocalDisplay=1; else mLocalDisplay=0;
- printf("vo: X11 running at %dx%d with depth %d and %d bits/pixel (\"%s\" => %s display)\n",
+ mp_msg(MSGT_VO,MSGL_INFO,"vo: X11 running at %dx%d with depth %d and %d bpp (\"%s\" => %s display)\n",
 	vo_screenwidth,vo_screenheight,
 	depth, vo_depthonscreen,
 	dispName,mLocalDisplay?"local":"remote");
@@ -379,7 +373,7 @@ void vo_uninit( void )
     return;
  }
 // if( !vo_depthonscreen ) return;
- printf("vo: uninit ...\n" );
+ mp_msg(MSGT_VO,MSGL_V,"vo: uninit ...\n" );
  XSetErrorHandler(NULL);
  XCloseDisplay( mDisplay );
  vo_depthonscreen = 0;
@@ -780,16 +774,16 @@ void saver_on(Display *mDisplay) {
 	if (DPMSQueryExtension(mDisplay, &nothing, &nothing))
 	{
 	    if (!DPMSEnable(mDisplay)) {  // restoring power saving settings
-                printf("DPMS not available?\n");
+                mp_msg(MSGT_VO,MSGL_WARN,"DPMS not available?\n");
             } else {
                 // DPMS does not seem to be enabled unless we call DPMSInfo
 	        BOOL onoff;
         	CARD16 state;
         	DPMSInfo(mDisplay, &state, &onoff);
                 if (onoff) {
-	            printf ("Successfully enabled DPMS\n");
+	            mp_msg(MSGT_VO,MSGL_INFO,"Successfully enabled DPMS\n");
                 } else {
-	            printf ("Could not enable DPMS\n");
+	            mp_msg(MSGT_VO,MSGL_WARN,"Could not enable DPMS\n");
                 }
             }
 	}
@@ -820,10 +814,10 @@ void saver_off(Display *mDisplay) {
 	if (onoff)
 	{
            Status stat;
-	    printf ("Disabling DPMS\n");
+	    mp_msg(MSGT_VO,MSGL_INFO,"Disabling DPMS\n");
 	    dpms_disabled=1;
 	    stat = DPMSDisable(mDisplay);  // monitor powersave off
-            printf ("stat: %d\n", stat);
+            mp_msg(MSGT_VO,MSGL_V,"DPMSDisable stat: %d\n", stat);
 	}
     }
 #endif
@@ -857,10 +851,10 @@ void vo_vm_switch(uint32_t X, uint32_t Y, int* modeline_width, int* modeline_hei
     
     if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) {
       XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev);
-      printf("XF86VidMode Extension v%i.%i\n", vm_ver, vm_rev);
+      mp_msg(MSGT_VO,MSGL_V,"XF86VidMode Extension v%i.%i\n", vm_ver, vm_rev);
       have_vm=1;
     } else
-      printf("XF86VidMode Extenstion not available.\n");
+      mp_msg(MSGT_VO,MSGL_WARN,"XF86VidMode Extenstion not available.\n");
 
     if (have_vm) {
       if (vidmodes==NULL)
@@ -878,7 +872,7 @@ void vo_vm_switch(uint32_t X, uint32_t Y, int* modeline_width, int* modeline_hei
 	      j=i;
 	    }
       
-      printf("XF86VM: Selected video mode %dx%d for image size %dx%d.\n",*modeline_width, *modeline_height, X, Y);
+      mp_msg(MSGT_VO,MSGL_INFO,"XF86VM: Selected video mode %dx%d for image size %dx%d.\n",*modeline_width, *modeline_height, X, Y);
       XF86VidModeLockModeSwitch(mDisplay,mScreen,0);
       XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]);
       XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]);
@@ -904,7 +898,7 @@ void vo_vm_close(Display *dpy)
            for (i=0; i<modecount; i++)
              if ((vidmodes[i]->hdisplay == vo_screenwidth) && (vidmodes[i]->vdisplay == vo_screenheight)) 
                { 
-                 printf("\nReturning to original mode %dx%d\n", vo_screenwidth, vo_screenheight);
+                 mp_msg(MSGT_VO,MSGL_INFO,"\nReturning to original mode %dx%d\n", vo_screenwidth, vo_screenheight);
                  break;
                }