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

EMI: Replace asserts with warning when trying to change parameters of a sound track that doesn't exist.

Browse Source
This commit is contained in:
Joni Vähämäki 2014-07-18 15:13:24 +03:00
parent f3c5b3619e
commit e3c6c1d66f
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engines/grim/emi/sound/emisound.cpp
View File

@ -153,27 +153,40 @@ bool EMISound::getSoundStatus(const char *soundName) {
void EMISound::stopSound(const char *soundName) {
int32 channel = getChannelByName(soundName);
assert(channel != -1);
g_system->getMixer()->stopHandle(*_channels[channel]->getHandle());
freeChannel(channel);
if (channel == -1) {
Debug::warning(Debug::Sound, "Sound track '%s' could not be found to stop", soundName);
} else {
g_system->getMixer()->stopHandle(*_channels[channel]->getHandle());
freeChannel(channel);
}
}
int32 EMISound::getPosIn16msTicks(const char *soundName) {
int32 channel = getChannelByName(soundName);
assert(channel != -1);
return g_system->getMixer()->getSoundElapsedTime(*_channels[channel]->getHandle()) / 16;
if (channel == -1) {
Debug::warning(Debug::Sound, "Sound track '%s' could not be found to get ticks", soundName);
return 0;
} else {
return g_system->getMixer()->getSoundElapsedTime(*_channels[channel]->getHandle()) / 16;
}
}
void EMISound::setVolume(const char *soundName, int volume) {
int32 channel = getChannelByName(soundName);
assert(channel != -1);
g_system->getMixer()->setChannelVolume(*_channels[channel]->getHandle(), volume);
if (channel == -1) {
Debug::warning(Debug::Sound, "Sound track '%s' could not be found to set volume", soundName);
} else {
g_system->getMixer()->setChannelVolume(*_channels[channel]->getHandle(), volume);
}
}
void EMISound::setPan(const char *soundName, int pan) {
int32 channel = getChannelByName(soundName);
assert(channel != -1);
g_system->getMixer()->setChannelBalance(*_channels[channel]->getHandle(), pan * 2 - 127);
if (channel == -1) {
Debug::warning(Debug::Sound, "Sound track '%s' could not be found to set pan", soundName);
} else {
g_system->getMixer()->setChannelBalance(*_channels[channel]->getHandle(), pan * 2 - 127);
}
}
SoundTrack *EMISound::createEmptyMusicTrack() const {