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

Fixed bug ("BASS: BG Sound stopped on opening item list"). Apparently

Browse Source 
the sound is supposed to be paused and then unpaused, but the pause function is
called many more times than the unpause function. In the original, this
presumably didn't matter. In ScummVM's mixer, it does.

svn-id: r33570
This commit is contained in:
Torbjörn Andersson 2008-08-03 10:16:17 +00:00
parent e8cee7823d
commit 117dee5e4a
2 changed files with 13 additions and 4 deletions
engines/sky
sound.cppsound.h

15
engines/sky/sound.cpp

@ -1025,6 +1025,7 @@ Sound::Sound(Audio::Mixer *mixer, Disk *pDisk, uint8 pVolume) {
_mixer = mixer;
_saveSounds[0] = _saveSounds[1] = 0xFFFF;
_mainSfxVolume = pVolume;
_isPaused = false;
}
Sound::~Sound(void) {
@ -1254,14 +1255,20 @@ bool Sound::startSpeech(uint16 textNum) {
void Sound::fnPauseFx(void) {
_mixer->pauseID(SOUND_CH0, true);
_mixer->pauseID(SOUND_CH1, true);
if (!_isPaused) {
_isPaused = true;
_mixer->pauseID(SOUND_CH0, true);
_mixer->pauseID(SOUND_CH1, true);
}
}
void Sound::fnUnPauseFx(void) {
_mixer->pauseID(SOUND_CH0, false);
_mixer->pauseID(SOUND_CH1, false);
if (_isPaused) {
_isPaused = false;
_mixer->pauseID(SOUND_CH0, false);
_mixer->pauseID(SOUND_CH1, false);
}
}
} // End of namespace Sky

2
engines/sky/sound.h

@ -89,6 +89,8 @@ private:
uint8 *_sampleRates, *_sfxInfo;
uint8 _mainSfxVolume;
bool _isPaused;
static uint16 _speechConvertTable[8];
static SfxQueue _sfxQueue[MAX_QUEUED_FX];
};