libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-05 16:21:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix for bug #598938: sfx/music volume set 0 is not mute; some cleanup

Browse Source 
svn-id: r4805
This commit is contained in:
Max Horn 2002-08-23 20:33:29 +00:00
parent 0a520b237b
commit 08b161f113
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/imuse.cpp
View File

@ -1271,7 +1271,7 @@ int IMuseInternal::set_master_volume_intern(uint vol)
if (vol > 127) if (vol > 127)
return -1; return -1;
if (_music_volume > 0) if (_music_volume >= 0)
vol = vol * _music_volume / 128; vol = vol * _music_volume / 128;
_master_volume = vol; _master_volume = vol;

4
sound/mixer.cpp
View File

@ -757,7 +757,6 @@ void SoundMixer::Channel_MP3::mix(int16 *data, uint len)
{ {
mad_fixed_t const *ch; mad_fixed_t const *ch;
const int16 *vol_tab = _mixer->_volume_table; const int16 *vol_tab = _mixer->_volume_table;
// unsigned char volume = ((int)vol_tab[1]) * 32 / 255;
unsigned char volume = ((int)vol_tab[1]) / 8; unsigned char volume = ((int)vol_tab[1]) / 8;
if (_to_be_destroyed) { if (_to_be_destroyed) {
@ -770,7 +769,7 @@ void SoundMixer::Channel_MP3::mix(int16 *data, uint len)
/* Skip _silence_cut a the start */ /* Skip _silence_cut a the start */
if ((_pos_in_frame < _synth.pcm.length) && (_silence_cut > 0)) { 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) if (diff > _silence_cut)
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_fixed_t const *ch;
mad_timer_t frame_duration; mad_timer_t frame_duration;
// unsigned char volume = _mixer->_music_volume * 32 / 255;
unsigned char volume = _mixer->_music_volume / 8; unsigned char volume = _mixer->_music_volume / 8;
if (_to_be_destroyed) { if (_to_be_destroyed) {