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

SWORD25: Change unknow handle error into a warning

Browse Source 
Also add sanity checks when calling findHandle() in the SoundEngine.
This fixes an issue when functions of SoundEngine are called on a
sound that has already finished playing (the most common
occurrences are calls to isSoundPlaying()).
This commit is contained in:
Thierry Crozat 2011-06-26 18:40:31 +01:00
parent 32392c9430
commit 55a7bbf86a
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
engines/sword25/sfx/soundengine.cpp
View File

@ -174,7 +174,7 @@ SndHandle *SoundEngine::findHandle(uint id) {
return &_handles[i]; return &_handles[i];
} }
error("Sound::findHandle(): Unknown handle"); warning("Sound::findHandle(): Unknown handle");
return NULL; return NULL;
} }
@ -224,31 +224,41 @@ uint SoundEngine::playSoundEx(const Common::String &fileName, SOUND_TYPES type,
void SoundEngine::setSoundVolume(uint handle, float volume) { void SoundEngine::setSoundVolume(uint handle, float volume) {
debugC(1, kDebugSound, "SoundEngine::setSoundVolume(%d, %f)", handle, volume); debugC(1, kDebugSound, "SoundEngine::setSoundVolume(%d, %f)", handle, volume);
_mixer->setChannelVolume(findHandle(handle)->handle, (byte)(volume * 255)); SndHandle* sndHandle = findHandle(handle);
if (sndHandle != NULL)
_mixer->setChannelVolume(sndHandle->handle, (byte)(volume * 255));
} }
void SoundEngine::setSoundPanning(uint handle, float pan) { void SoundEngine::setSoundPanning(uint handle, float pan) {
debugC(1, kDebugSound, "SoundEngine::setSoundPanning(%d, %f)", handle, pan); debugC(1, kDebugSound, "SoundEngine::setSoundPanning(%d, %f)", handle, pan);
_mixer->setChannelBalance(findHandle(handle)->handle, (int8)(pan * 127)); SndHandle* sndHandle = findHandle(handle);
if (sndHandle != NULL)
_mixer->setChannelBalance(sndHandle->handle, (int8)(pan * 127));
} }
void SoundEngine::pauseSound(uint handle) { void SoundEngine::pauseSound(uint handle) {
debugC(1, kDebugSound, "SoundEngine::pauseSound(%d)", handle); debugC(1, kDebugSound, "SoundEngine::pauseSound(%d)", handle);
_mixer->pauseHandle(findHandle(handle)->handle, true); SndHandle* sndHandle = findHandle(handle);
if (sndHandle != NULL)
_mixer->pauseHandle(sndHandle->handle, true);
} }
void SoundEngine::resumeSound(uint handle) { void SoundEngine::resumeSound(uint handle) {
debugC(1, kDebugSound, "SoundEngine::resumeSound(%d)", handle); debugC(1, kDebugSound, "SoundEngine::resumeSound(%d)", handle);
_mixer->pauseHandle(findHandle(handle)->handle, false); SndHandle* sndHandle = findHandle(handle);
if (sndHandle != NULL)
_mixer->pauseHandle(sndHandle->handle, false);
} }
void SoundEngine::stopSound(uint handle) { void SoundEngine::stopSound(uint handle) {
debugC(1, kDebugSound, "SoundEngine::stopSound(%d)", handle); debugC(1, kDebugSound, "SoundEngine::stopSound(%d)", handle);
_mixer->stopHandle(findHandle(handle)->handle); SndHandle* sndHandle = findHandle(handle);
if (sndHandle != NULL)
_mixer->stopHandle(sndHandle->handle);
} }
bool SoundEngine::isSoundPaused(uint handle) { bool SoundEngine::isSoundPaused(uint handle) {
@ -262,19 +272,28 @@ bool SoundEngine::isSoundPaused(uint handle) {
bool SoundEngine::isSoundPlaying(uint handle) { bool SoundEngine::isSoundPlaying(uint handle) {
debugC(1, kDebugSound, "SoundEngine::isSoundPlaying(%d)", handle); debugC(1, kDebugSound, "SoundEngine::isSoundPlaying(%d)", handle);
return _mixer->isSoundHandleActive(findHandle(handle)->handle); SndHandle* sndHandle = findHandle(handle);
if (sndHandle == NULL)
return false;
return _mixer->isSoundHandleActive(sndHandle->handle);
} }
float SoundEngine::getSoundVolume(uint handle) { float SoundEngine::getSoundVolume(uint handle) {
debugC(1, kDebugSound, "SoundEngine::getSoundVolume(%d)", handle); debugC(1, kDebugSound, "SoundEngine::getSoundVolume(%d)", handle);
return (float)_mixer->getChannelVolume(findHandle(handle)->handle) / 255.0; SndHandle* sndHandle = findHandle(handle);
if (sndHandle == NULL)
return 0.f;
return (float)_mixer->getChannelVolume(sndHandle->handle) / 255.0;
} }
float SoundEngine::getSoundPanning(uint handle) { float SoundEngine::getSoundPanning(uint handle) {
debugC(1, kDebugSound, "SoundEngine::getSoundPanning(%d)", handle); debugC(1, kDebugSound, "SoundEngine::getSoundPanning(%d)", handle);
return (float)_mixer->getChannelBalance(findHandle(handle)->handle) / 127.0; SndHandle* sndHandle = findHandle(handle);
if (sndHandle == NULL)
return 0.f;
return (float)_mixer->getChannelBalance(sndHandle->handle) / 127.0;
} }
Resource *SoundEngine::loadResource(const Common::String &fileName) { Resource *SoundEngine::loadResource(const Common::String &fileName) {