[MPlayer-cvslog] CVS: main/libao2 ao_sun.c,1.35,1.36

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv19521/libao2

Modified Files:
	ao_sun.c 
Log Message:
Convert all if(verbose>X) to mp_msg_test calls.


Index: ao_sun.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_sun.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ao_sun.c	6 Jan 2005 22:56:54 -0000	1.35
+++ ao_sun.c	24 Mar 2006 08:12:01 -0000	1.36
@@ -64,7 +64,6 @@
     RTSC_DISABLED
 } enable_sample_timing;
 
-extern int verbose;
 
 
 // convert an OSS audio format specification into a sun audio encoding
@@ -127,19 +126,19 @@
     info.play.encoding = AUDIO_ENCODING_LINEAR;
     info.play.samples = 0;
     if (ioctl(fd, AUDIO_SETINFO, &info)) {
-	if (verbose>0)
+	if ( mp_msg_test(MSGT_AO,MSGL_V) )
 	    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_RtscSetinfoFailed);
 	goto error;
     }
     
     if (write(fd, silence, len) != len) {
-	if (verbose>0)
+	if ( mp_msg_test(MSGT_AO,MSGL_V) )
 	    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_RtscWriteFailed);
 	goto error;
     }
 
     if (ioctl(fd, AUDIO_GETINFO, &info)) {
-	if (verbose>0)
+	if ( mp_msg_test(MSGT_AO,MSGL_V) )
 	    perror("rtsc: GETINFO1");
 	goto error;
     }
@@ -161,18 +160,18 @@
 	    break;
 
 	if (ioctl(fd, AUDIO_GETINFO, &info)) {
-	    if (verbose>0)
+	    if ( mp_msg_test(MSGT_AO,MSGL_V) )
 		perror("rtsc: GETINFO2 failed");
 	    goto error;
 	}
 	if (info.play.samples < last_samplecnt) {
-	    if (verbose>0)
+	    if ( mp_msg_test(MSGT_AO,MSGL_V) )
 		printf("rtsc: %d > %d?\n", last_samplecnt, info.play.samples);
 	    goto error;
 	}
 
 	if ((increment = info.play.samples - last_samplecnt) > 0) {
-	    if (verbose>0)
+	    if ( mp_msg_test(MSGT_AO,MSGL_V) )
 		printf("ao_sun: sample counter increment: %d\n", increment);
 	    if (increment < min_increment) {
 		min_increment = increment;
@@ -195,7 +194,7 @@
     if (min_increment < 2000)
 	rtsc_ok = RTSC_ENABLED;
 
-    if (verbose>0)
+    if ( mp_msg_test(MSGT_AO,MSGL_V) )
 	printf("ao_sun: minimum sample counter increment per 10msec interval: %d\n"
 	       "\t%susing sample counter based timing code\n",
 	       min_increment, rtsc_ok == RTSC_ENABLED ? "" : "not ");