From 08b161f1137b9b7590c2acbbed13c2154fc89afc Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 23 Aug 2002 20:33:29 +0000
Subject: fix for bug #598938: sfx/music volume set 0 is not mute; some cleanup

svn-id: r4805
---
 sound/mixer.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'sound/mixer.cpp')

diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 201b848f8f..38f25ed6e4 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -757,7 +757,6 @@ void SoundMixer::Channel_MP3::mix(int16 *data, uint len)
 {
 	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 @@ void SoundMixer::Channel_MP3::mix(int16 *data, uint len)
 
 		/* 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 @@ void SoundMixer::Channel_MP3_CDMUSIC::mix(int16 *data, uint len)
 {
 	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) {
-- 
cgit v1.2.3