mplayer.hg: libvo/x11_common.c comparison

comparison libvo/x11_common.c @ 6296:74115095d9fe

msg/i18n fixes and some printf->mp_msg

author	arpi
date	Mon, 03 Jun 2002 23:23:03 +0000
parents	1e275c6cabb2
children	ad98962908ac

comparison

equal deleted inserted replaced

-:3368f774d9a4
+:74115095d9fe
 visuals = XGetVisualInfo(dpy,
 			   VisualScreenMask | VisualClassMask, &visual_tmpl,
 			   &nvisuals);
 if (visuals != NULL) {
 for (i = 0; i < nvisuals; i++) {
-if (verbose)
+mp_msg(MSGT_VO,MSGL_V,"vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n",
-	printf("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);
 /*
 * save the visual index and it's depth, if this is the first
 #define MSGLEN 60
 char msg[MSGLEN];
 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)
+mp_msg(MSGT_VO,MSGL_V,"Type: %x, display: %x, resourceid: %x, serial: %x\n",
-{
-	printf("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");
 #undef MSGLEN
 }
 mDisplayName=strdup(":0.0");
 #else
 dispName = XDisplayName(mDisplayName);
 #endif
-if (verbose)
+mp_msg(MSGT_VO,MSGL_V,"X11 opening display: %s\n", dispName);
-printf("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.
 mRootWin=RootWindow( mDisplay,mScreen );// Root window ID.
 * Maybe we should rename vo_depthonscreen to (or add) vo_bpp?
 */
 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)
+mp_msg(MSGT_VO,MSGL_V,"vo: X11 color mask:  %X  (R:%lX G:%lX B:%lX)\n",
-printf("vo: X11 color mask:  %X  (R:%lX G:%lX B:%lX)\n",
 	    mask,mXImage->red_mask,mXImage->green_mask,mXImage->blue_mask);
 XDestroyImage( mXImage );
 }
 if(((vo_depthonscreen+7)/8)==2){
 if(mask==0x7FFF) vo_depthonscreen=15; else
 if ( strncmp(dispName, "unix:", 5) == 0)
 		dispName += 4;
 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");
 vo_wm_type=vo_wm_detect();
 {
 mp_msg(MSGT_VO, MSGL_V, "vo: x11 uninit called but X11 not inited..\n");
 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;
 mDisplay=NULL;
 }
 if (dpms_disabled)
 {
 	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");
 }
 }
 	}
 }
 #endif
 	CARD16 state;
 	DPMSInfo(mDisplay, &state, &onoff);
 	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
 XGetScreenSaver(mDisplay, &timeout_save, &interval, &prefer_blank, &allow_exp);
 if (timeout_save)
 int modecount;
 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)
 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes);
 j=0;
 	      *modeline_width=vidmodes[i]->hdisplay;
 	      *modeline_height=vidmodes[i]->vdisplay;
 	      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]);
 X=(vo_screenwidth-*modeline_width)/2;
 Y=(vo_screenheight-*modeline_height)/2;
 free(vidmodes); vidmodes=NULL;
 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes);
 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;
 }
 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]);
 XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]);

Mercurial > mplayer.hg

comparison libvo/x11_common.c @ 6296:74115095d9fe