libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-26 14:27:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I accidentally introduced a bug when I changed the fading that would cause

Browse Source 
fading-up music to distort and eventually deteriorate into white noise.

This was because I allowed _fade to be set on channels that weren't playing
and because I only checked _fade for equality when deciding when to stop
the fading. It should work much better now, I think.

svn-id: r12392
This commit is contained in:
Torbjörn Andersson 2004-01-14 18:33:30 +00:00
parent 6ca6f13c6d
commit 4980331ecf
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sword2/driver/d_sound.cpp
View File

@ -131,17 +131,21 @@ int32 Sound::_musicVolTable[17] = {
};
void MusicHandle::fadeDown(void) {
if (_fading < 0)
_fading = -_fading;
else if (_fading == 0)
_fading = FADE_SAMPLES;
if (_streaming) {
if (_fading < 0)
_fading = -_fading;
else if (_fading == 0)
_fading = FADE_SAMPLES;
}
}
void MusicHandle::fadeUp(void) {
if (_fading > 0)
_fading = -_fading;
else if (_fading == 0)
_fading = -1;
if (_streaming) {
if (_fading > 0)
_fading = -_fading;
else if (_fading == 0)
_fading = -1;
}
}
int32 MusicHandle::play(const char *filename, uint32 musicId, bool looping) {
@ -223,7 +227,7 @@ int MusicHandle::readBuffer(int16 *buffer, const int numSamples) {
} else if (_fading < 0) {
_fading--;
out = -(out * _fading) / FADE_SAMPLES;
if (_fading == -FADE_SAMPLES)
if (_fading <= -FADE_SAMPLES)
_fading = 0;
}
}
@ -353,10 +357,8 @@ void Sound::restoreMusicState(void) {
// Fade out any music that happens to be playing
for (int i = 0; i < MAXMUS; i++) {
if (_music[i]._streaming)
_music[i].fadeDown();
}
for (int i = 0; i < MAXMUS; i++)
_music[i].fadeDown();
if (!_music[2]._streaming)
return;