Mercurial > mplayer.hg

changeset 17969:843e0427b5b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change 'if(verbose)' to the more appropriate mp_msg_test.
author diego
date Mon, 27 Mar 2006 07:22:48 +0000
parents 963062e18809
children 77ecc381e6e9
files libmpcodecs/ve_vfw.c libmpcodecs/vf_phase.c libmpcodecs/vf_tile.c libvo/osd.c libvo/vo_directfb2.c
diffstat 5 files changed, 14 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ve_vfw.c	Mon Mar 27 06:59:00 2006 +0000
+++ b/libmpcodecs/ve_vfw.c	Mon Mar 27 07:22:48 2006 +0000
@@ -126,7 +126,7 @@
     for(i=sizeof(output_bih);i<temp_len;i++) mp_msg(MSGT_WIN32, MSGL_DBG2, "%02X ",temp[i]);
   }
 
-//  if(verbose) {
+//  if( mp_msg_test(MSGT_WIN32,MSGL_V) ) {
     printf("Starting compression:\n");
     printf(" Input format:\n");
 	printf("  biSize %d\n", input_bih->biSize);
--- a/libmpcodecs/vf_phase.c	Mon Mar 27 06:59:00 2006 +0000
+++ b/libmpcodecs/vf_phase.c	Mon Mar 27 07:22:48 2006 +0000
@@ -166,7 +166,7 @@
 	 mode=PROGRESSIVE;
       }
 
-   if(verbose)
+   if( mp_msg_test(MSGT_VFILTER,MSGL_V) )
       {
       printf("%c", mode==BOTTOM_FIRST?'b':mode==TOP_FIRST?'t':'p');
       if(tdiff==65536.0) printf("     N/A "); else printf(" %8.2f", tdiff);
--- a/libmpcodecs/vf_tile.c	Mon Mar 27 06:59:00 2006 +0000
+++ b/libmpcodecs/vf_tile.c	Mon Mar 27 07:22:48 2006 +0000
@@ -47,9 +47,6 @@
 
 #include "libvo/fastmemcpy.h"
 
-/* external */
-extern int verbose;
-
 /* private data */
 struct vf_priv_s {
     /* configuration data */
@@ -290,7 +287,7 @@
     }
 
     /* Say what happen: use mp_msg(...)? */
-    if (verbose) {
+    if ( mp_msg_test(MSGT_VFILTER,MSGL_V) ) {
         printf("vf_tile: tiling %d * %d, output every %d frames\n",
                p->xtile,
                p->ytile,
--- a/libvo/osd.c	Mon Mar 27 06:59:00 2006 +0000
+++ b/libvo/osd.c	Mon Mar 27 07:22:48 2006 +0000
@@ -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
--- a/libvo/vo_directfb2.c	Mon Mar 27 06:59:00 2006 +0000
+++ b/libvo/vo_directfb2.c	Mon Mar 27 07:22:48 2006 +0000
@@ -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;