[Scummvm-cvs-logs] CVS: scummvm-new/sound mixer.cpp,1.1.1.1,1.2

Max Horn fingolfin at users.sourceforge.net
Fri Aug 23 13:34:02 CEST 2002


Update of /cvsroot/scummvm/scummvm-new/sound
In directory usw-pr-cvs1:/tmp/cvs-serv2856/sound

Modified Files:
	mixer.cpp 
Log Message:
fix for bug #598938: sfx/music volume set 0 is not mute; some cleanup

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/sound/mixer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- mixer.cpp	21 Aug 2002 16:07:42 -0000	1.1.1.1
+++ mixer.cpp	23 Aug 2002 20:33:07 -0000	1.2
@@ -757,7 +757,6 @@
 {
 	mad_fixed_t const *ch;
 	const int16 *vol_tab = _mixer->_volume_table;
-//	unsigned char volume = ((int)vol_tab[1]) * 32 / 255;
 	unsigned char volume = ((int)vol_tab[1]) / 8;
 
 	if (_to_be_destroyed) {
@@ -770,7 +769,7 @@
 
 		/* Skip _silence_cut a the start */
 		if ((_pos_in_frame < _synth.pcm.length) && (_silence_cut > 0)) {
-			int diff = _synth.pcm.length - _pos_in_frame;
+			uint32 diff = _synth.pcm.length - _pos_in_frame;
 			
 			if (diff > _silence_cut)
 				diff = _silence_cut;
@@ -852,7 +851,6 @@
 {
 	mad_fixed_t const *ch;
 	mad_timer_t frame_duration;
-//	unsigned char volume = _mixer->_music_volume * 32 / 255;
 	unsigned char volume = _mixer->_music_volume / 8;
 
 	if (_to_be_destroyed) {





More information about the Scummvm-git-logs mailing list