1
mirror of https://github.com/mpv-player/mpv synced 2024-10-30 04:46:41 +01:00

Change 'if(verbose)' to the more appropriate mp_msg_test.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17970 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-03-27 07:22:48 +00:00
parent f8687cd3f9
commit 7416ded30b
5 changed files with 14 additions and 21 deletions

View File

@ -126,7 +126,7 @@ static int vfw_start_encoder(BITMAPINFOHEADER *input_bih, BITMAPINFOHEADER *outp
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);

View File

@ -166,7 +166,7 @@ static enum mode analyze_plane(unsigned char *old, unsigned char *new,
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);

View File

@ -47,9 +47,6 @@
#include "libvo/fastmemcpy.h"
/* external */
extern int verbose;
/* private data */
struct vf_priv_s {
/* configuration data */
@ -290,7 +287,7 @@ static int open(vf_instance_t *vf, char* args)
}
/* 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,

View File

@ -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 @@ void vo_draw_alpha_init(void){
}
#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

View File

@ -64,8 +64,6 @@ static vo_info_t info = {
LIBVO_EXTERN(directfb)
extern int verbose;
/******************************
* vo_directfb globals *
******************************/
@ -903,7 +901,7 @@ if (buffer) {
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 @@ if (buffer) {
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 @@ static void flip_page(void)
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 @@ static uint32_t get_image(mp_image_t *mpi)
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 @@ static uint32_t get_image(mp_image_t *mpi)
}
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 @@ static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y)
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 @@ static uint32_t put_image(mp_image_t *mpi){
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 @@ static uint32_t put_image(mp_image_t *mpi){
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 @@ static uint32_t put_image(mp_image_t *mpi){
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;