[Mplayer-cvslog] CVS: main/libao2 ao_sun.c,1.19,1.20

Arpi of Ize arpi at mplayerhq.hu
Mon Sep 16 21:46:05 CEST 2002


Update of /cvsroot/mplayer/main/libao2
In directory mail:/var/tmp.root/cvs-serv26954

Modified Files:
	ao_sun.c 
Log Message:
*bsd doesn't have info.output_muted - patch by Björn Sandell <biorn at dce.chalmers.se>


Index: ao_sun.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_sun.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ao_sun.c	12 Sep 2002 16:59:11 -0000	1.19
+++ ao_sun.c	16 Sep 2002 19:46:02 -0000	1.20
@@ -279,14 +279,16 @@
 	    float volume;
 	    AUDIO_INITINFO(&info);
 	    volume = vol->right > vol->left ? vol->right : vol->left;
-	    info.output_muted = (volume == 0);
-	    if ( !info.output_muted ) {
+	    if ( volume != 0 ) {
 		info.play.gain = volume * AUDIO_MAX_GAIN / 100;
 		if ( vol->right == vol->left )
 		    info.play.balance = AUDIO_MID_BALANCE;
 		else
 		    info.play.balance = (vol->right - vol->left + volume) * AUDIO_RIGHT_BALANCE / (2*volume);
 	    }
+#if !defined (__OpenBSD__) && !defined (__NetBSD__)
+	    info.output_muted = (volume == 0);
+#endif
 	    ioctl( fd,AUDIO_SETINFO,&info );
 	    close( fd );
 	    return CONTROL_OK;




More information about the MPlayer-cvslog mailing list