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

SCI: kDoSound: only one sample at once - thx wjp

Browse Source 
Calling kDoSound(play) on a sample will stop currently playing sample
Fixes Space Quest 5 air-lock sound issue (bug #6464)
Thanks to wjp for tracking the issue down
This commit is contained in:
Martin Kiewitz 2014-05-29 23:57:09 +02:00
parent ab2d33f0dc
commit d1bab54a4a
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engines/sci/sound/music.cpp
View File

@ -142,6 +142,8 @@ void SciMusic::init() {
_driverLastChannel = _pMidiDrv->getLastChannel();
if (getSciVersion() <= SCI_VERSION_0_LATE)
_globalReverb = _pMidiDrv->getReverb(); // Init global reverb for SCI0
_currentlyPlayingSample = NULL;
}
void SciMusic::miditimerCallback(void *p) {
@ -432,6 +434,17 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
if (pSnd->pStreamAud) {
if (!_pMixer->isSoundHandleActive(pSnd->hCurrentAud)) {
if ((_currentlyPlayingSample) && (_pMixer->isSoundHandleActive(_currentlyPlayingSample->hCurrentAud))) {
// Another sample is already playing, we have to stop that one
// SSCI is only able to play 1 sample at a time
// In Space Quest 5 room 250 the player is able to open the air-hatch and kill himself.
// In that situation the scripts are playing 2 samples at the same time and the first sample
// is not supposed to play.
// TODO: SSCI actually calls kDoAudio(play) internally, which stops other samples from being played
// but such a change isn't trivial, because we also handle Sound resources in here, that contain samples
_pMixer->stopHandle(_currentlyPlayingSample->hCurrentAud);
warning("kDoSound: sample already playing, old resource %d, new resource %d", _currentlyPlayingSample->resourceId, pSnd->resourceId);
}
// Sierra SCI ignores volume set when playing samples via kDoSound
// At least freddy pharkas/CD has a script bug that sets volume to 0
// when playing the "score" sample
@ -449,6 +462,8 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
pSnd->pStreamAud, -1, _pMixer->kMaxChannelVolume, 0,
DisposeAfterUse::NO);
}
// Remember the sample, that is now playing
_currentlyPlayingSample = pSnd;
}
} else {
if (pSnd->pMidiParser) {
@ -495,8 +510,11 @@ void SciMusic::soundStop(MusicEntry *pSnd) {
pSnd->status = kSoundStopped;
if (_soundVersion <= SCI_VERSION_0_LATE)
pSnd->isQueued = false;
if (pSnd->pStreamAud)
if (pSnd->pStreamAud) {
if (_currentlyPlayingSample == pSnd)
_currentlyPlayingSample = NULL;
_pMixer->stopHandle(pSnd->hCurrentAud);
}
if (pSnd->pMidiParser) {
Common::StackLock lock(_mutex);
@ -556,6 +574,10 @@ void SciMusic::soundKill(MusicEntry *pSnd) {
_mutex.unlock();
if (pSnd->pStreamAud) {
if (_currentlyPlayingSample == pSnd) {
// Forget about this sound, in case it was currently playing
_currentlyPlayingSample = NULL;
}
_pMixer->stopHandle(pSnd->hCurrentAud);
delete pSnd->pStreamAud;
pSnd->pStreamAud = NULL;

2
engines/sci/sound/music.h
View File

@ -264,6 +264,8 @@ private:
int _driverFirstChannel;
int _driverLastChannel;
MusicEntry *_currentlyPlayingSample;
};
} // End of namespace Sci