mplayer.hg: libvo/vo_xv.c comparison

comparison libvo/vo_xv.c @ 5935:5074aa8fae5a

printf to mp_msg

author	albeu
date	Thu, 02 May 2002 10:49:55 +0000
parents	104fce2b92b6
children	f9fe22a52e80

comparison

equal deleted inserted replaced

-:42127864a2b3
+:5074aa8fae5a
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
+#include "mp_msg.h"
 #include "video_out.h"
 #include "video_out_internal.h"
 LIBVO_EXTERN(xv)
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>
 static int Shmem_Flag;
-static int Quiet_Flag;
+//static int Quiet_Flag; <-- What is that for ? Albeu.
 static XShmSegmentInfo Shminfo[NUM_BUFFERS];
 static int gXErrorFlag;
 static int CompletionType = -1;
 static uint32_t image_width;
 {
 if (attributes[i].flags & XvSettable && !strcmp(attributes[i].name,"XV_SET_DEFAULTS"
 ))
 {
 		was_reset = 1;
-		if(verbose > 1) printf("vo_xv: reset gamma correction\n");
+		mp_msg(MSGT_VO,MSGL_V,"vo_xv: reset gamma correction\n");
 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True);
 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, attributes[i].max_value);
 	    }
 }
 	/* for safety purposes */
 		    if(!port_value && use_reset) continue;
 		    port_min = xv_min;
 		    port_max = xv_max;
 		    port_mid = (port_min + port_max) / 2;
 		    port_value = port_mid + (port_value * (port_max - port_min)) / 2000;
-		    if(verbose > 1)
+		    mp_msg(MSGT_VO,MSGL_V,"vo_xv: set gamma %s to %i (min %i max %i mid %i)\n",attributes[i].name,port_value,port_min,port_max,port_mid);
-			printf("vo_xv: set gamma %s to %i (min %i max %i mid %i)\n",attributes[i].name,port_value,port_min,port_max,port_mid);
 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, port_value);
 }
 }
 }
 return 0;
 then trigger it if it's ok so that the other values are at default upon query */
 if (xv_atomka != None)
 {
 		    int port_value,port_min,port_max,port_mid;
 XvGetPortAttribute(mDisplay, xv_port, xv_atomka, &port_value);
-		    if(verbose>1) printf("vo_xv: get: %s = %i\n",attributes[i].name,port_value);
+		    mp_msg(MSGT_VO,MSGL_V,"vo_xv: get: %s = %i\n",attributes[i].name,port_value);
 		    port_min = xv_min;
 		    port_max = xv_max;
 		    port_mid = (port_min + port_max) / 2;
 		    port_value = ((port_value - port_mid)*2000)/(port_max-port_min);
-		    if(verbose>1) printf("vo_xv: assume: %s = %i\n",attributes[i].name,port_value);
+		    mp_msg(MSGT_VO,MSGL_V,"vo_xv: assume: %s = %i\n",attributes[i].name,port_value);
 		    if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0)
 		    {
 			info->cap |= VEQ_CAP_BRIGHTNESS;
 			info->brightness = port_value;
 /* check image formats */
 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats);
 xv_format=0;
 if(format==IMGFMT_BGR24) format=IMGFMT_YV12;
 for(i = 0; i < formats; i++){
-printf("Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
+mp_msg(MSGT_VO,MSGL_V,"Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
 if (fo[i].id == format) xv_format = fo[i].id;
 }
 if (!xv_format) return -1;
 aspect_save_screenres(vo_screenwidth,vo_screenheight);
 #endif
 #ifdef HAVE_NEW_GUI
 }
 #endif
-printf( "using Xvideo port %d for hw scaling\n",xv_port );
+mp_msg(MSGT_VO,MSGL_V, "using Xvideo port %d for hw scaling\n",xv_port );
 switch (xv_format){
 	case IMGFMT_YV12:
 	case IMGFMT_I420:
 case IMGFMT_IYUV: draw_alpha_fnc=draw_alpha_yv12; break;
 set_gamma_correction();
 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
 drwX=0; drwY=0;
 XTranslateCoordinates( mDisplay,vo_window,mRoot,0,0,&drwcX,&drwcY,&mRoot );
-printf( "[xv] 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, "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
 aspect(&dwidth,&dheight,A_NOZOOM);
 if ( vo_fs )
 {
 aspect(&dwidth,&dheight,A_ZOOM);
 drwcX+=drwX;
 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
 drwcY+=drwY;
 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
-printf( "[xv-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, "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
 }
 saver_off(mDisplay);  // turning off screen saver
 return 0;
 }
 */
 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag = 1;
 else
 {
 Shmem_Flag = 0;
-if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xv\n" );
+mp_msg(MSGT_VO,MSGL_INFO, "Shared memory not supported\nReverting to normal Xv\n" );
 }
 if ( Shmem_Flag )
 {
 xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]);
 if(e&VO_EVENT_RESIZE)
 {
 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
 drwX=0; drwY=0;
 XTranslateCoordinates( mDisplay,vo_window,mRoot,0,0,&drwcX,&drwcY,&mRoot );
-printf( "[xv] 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, "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
 aspect(&dwidth,&dheight,A_NOZOOM);
 if ( vo_fs )
 {
 aspect(&dwidth,&dheight,A_ZOOM);
 drwcX+=drwX;
 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
 drwcY+=drwY;
 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
-printf( "[xv-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, "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
 }
 }
 if ( e & VO_EVENT_EXPOSE )
 {
 if ( Shmem_Flag )
 static uint32_t preinit(const char *arg)
 {
 XvPortID xv_p;
 if(arg)
 {
-	printf("vo_xv: Unknown subdevice: %s\n",arg);
+	mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg);
 	return ENOSYS;
 }
 if (!vo_init()) return -1;
 xv_port = 0;
 /* check for Xvideo extension */
 if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){
-	printf("Sorry, Xv not supported by this X11 version/driver\n");
+	mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n");
-	printf("******** Try with  -vo x11  or  -vo sdl  *********\n");
+	mp_msg(MSGT_VO,MSGL_ERR,"******** Try with  -vo x11  or  -vo sdl  *********\n");
 	return -1;
 }
 /* check for Xvideo support */
 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){
-	printf("Xv: XvQueryAdaptors failed");
+	mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed");
 	return -1;
 }
 /* check adaptors */
 for (i = 0; i < adaptors && xv_port == 0; i++){
-if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask))
+if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) {
 	 for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p)
 	     if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) {
 		 xv_port = xv_p;
 		 break;
 	     } else {
-		 printf("Xv: could not grab port %i\n", (int)xv_p);
+		 mp_msg(MSGT_VO,MSGL_ERR,"Xv: could not grab port %i\n", (int)xv_p);
 	     }
+}
 }
 if(!xv_port){
-	printf("Couldn't find free Xvideo port - maybe other applications keep open it\n");
+	mp_msg(MSGT_VO,MSGL_ERR,"Couldn't find free Xvideo port - maybe other applications keep open it\n");
 	return -1;
 }
 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats);

Mercurial > mplayer.hg

comparison libvo/vo_xv.c @ 5935:5074aa8fae5a