[MPlayer-cvslog] CVS: main/libvo osd.c, 1.25, 1.26 vo_directfb2.c, 1.21, 1.22

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	osd.c vo_directfb2.c 
Log Message:
Change 'if(verbose)' to the more appropriate mp_msg_test.


Index: osd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/osd.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- osd.c	9 Feb 2006 14:07:58 -0000	1.25
+++ osd.c	27 Mar 2006 07:22:48 -0000	1.26
@@ -12,8 +12,6 @@
 #include "cpudetect.h"
 #include "mangle.h"
 
-extern int verbose; // defined in mplayer.c
-
 #if defined(ARCH_X86) || defined(ARCH_X86_64)
 #define CAN_COMPILE_X86_ASM
 #endif
@@ -267,7 +265,7 @@
     }
 #endif
 //FIXME the optimized stuff is a lie for 15/16bpp as they aren't optimized yet
-	if(verbose)
+	if( mp_msg_test(MSGT_OSD,MSGL_V) )
 	{
 #ifdef RUNTIME_CPUDETECT
 #ifdef CAN_COMPILE_X86_ASM

Index: vo_directfb2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- vo_directfb2.c	2 Nov 2005 21:50:55 -0000	1.21
+++ vo_directfb2.c	27 Mar 2006 07:22:48 -0000	1.22
@@ -64,8 +64,6 @@
 
 LIBVO_EXTERN(directfb)
 
-extern int verbose;
-
 /******************************
 *      vo_directfb globals    *
 ******************************/
@@ -903,7 +901,7 @@
 
       DFBInputEvent event;
 
-//if (verbose) printf ("DirectFB: Check events entered\n");
+//if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf ("DirectFB: Check events entered\n");
      if (buffer->GetEvent(buffer, DFB_EVENT (&event)) == DFB_OK) {
 
      if (event.type == DIET_KEYPRESS) { 
@@ -932,7 +930,7 @@
     buffer->Reset(buffer);
 
 }
-//if (verbose) printf ("DirectFB: Check events finished\n");
+//if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf ("DirectFB: Check events finished\n");
 }
 
 static void flip_page(void)
@@ -941,7 +939,7 @@
 
 	unlock(); // unlock frame & primary
 
-//	if (verbose) printf("DirectFB: Flip page entered");
+//	if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Flip page entered");
 	
 	DFBCHECK (primary->SetBlittingFlags(primary,flags));
 
@@ -1143,7 +1141,7 @@
         void *dst;
         int pitch;
 
-//    if (verbose) printf("DirectFB: get_image() called\n");
+//    if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: get_image() called\n");
     if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram 
     if(mpi->type==MP_IMGTYPE_STATIC) return VO_FALSE; // it is not static
 
@@ -1199,7 +1197,7 @@
        }
        
        mpi->flags|=MP_IMGFLAG_DIRECT;
-//       if (verbose) printf("DirectFB: get_image() SUCCESS -> Direct Rendering ENABLED\n");
+//       if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: get_image() SUCCESS -> Direct Rendering ENABLED\n");
        return VO_TRUE;
 
     } 
@@ -1215,7 +1213,7 @@
         void *srcp;
 	unsigned int p;
 
-//        if (verbose) printf("DirectFB: draw_slice entered\n");
+//        if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: draw_slice entered\n");
 
 	unlock();
 
@@ -1296,13 +1294,13 @@
     DFBSurfaceDescription dsc;
     DFBRectangle rect;
     
-//    if (verbose) printf("DirectFB: Put_image entered %i %i %i %i %i %i\n",mpi->x,mpi->y,mpi->w,mpi->h,mpi->width,mpi->height);
+//    if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Put_image entered %i %i %i %i %i %i\n",mpi->x,mpi->y,mpi->w,mpi->h,mpi->width,mpi->height);
 
     unlock();
 
     // already out?
     if((mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK))) {
-//        if (verbose) printf("DirectFB: Put_image - nothing todo\n");
+//        if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Put_image - nothing todo\n");
 	return VO_TRUE;
     }
 
@@ -1314,7 +1312,7 @@
 	void *src;
 	unsigned int p;
 
-//        if (verbose) printf("DirectFB: Put_image - planar branch\n");
+//        if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Put_image - planar branch\n");
 	if (frame) {
 		DFBCHECK (frame->Lock(frame,DSLF_WRITE|DSLF_READ,&dst,&pitch));
 		framelocked = 1;
@@ -1398,7 +1396,7 @@
 	unsigned int pitch;
         void *dst;
 
-//        if (verbose) printf("DirectFB: Put_image - non planar branch\n");
+//        if ( mp_msg_test(MSGT_VO,MSGL_V) ) printf("DirectFB: Put_image - non planar branch\n");
 	if (frame) {
 		DFBCHECK (frame->Lock(frame,DSLF_WRITE,&dst,&pitch));
 		framelocked = 1;