diff options
author | James Brown | 2004-02-14 08:56:26 +0000 |
---|---|---|
committer | James Brown | 2004-02-14 08:56:26 +0000 |
commit | 5ee96b4625a2bfa64ba2b06dc37527bf3238d851 (patch) | |
tree | 3c064602f07818996b135304a32bf9ce858e4cdf /scumm/imuse_digi | |
parent | 6731606837debcc5aafa8b1680db9dae4a3e5887 (diff) | |
download | scummvm-rg350-5ee96b4625a2bfa64ba2b06dc37527bf3238d851.tar.gz scummvm-rg350-5ee96b4625a2bfa64ba2b06dc37527bf3238d851.tar.bz2 scummvm-rg350-5ee96b4625a2bfa64ba2b06dc37527bf3238d851.zip |
Add mutex tracking to make it easier to debug imuse deadlocks
svn-id: r12870
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r-- | scumm/imuse_digi/dimuse.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp index 5a4203d644..a5476af134 100644 --- a/scumm/imuse_digi/dimuse.cpp +++ b/scumm/imuse_digi/dimuse.cpp @@ -65,7 +65,7 @@ IMuseDigital::~IMuseDigital() { } void IMuseDigital::callback() { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::callback()"); int l = 0; if (_pause || !_vm) @@ -243,7 +243,7 @@ void IMuseDigital::switchToNextRegion(int track) { } void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, int soundGroup, AudioStream *input, bool sequence, int hookId, int volume, bool wait) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::startSound()"); debug(5, "IMuseDigital::startSound(%d)", soundId); int l; @@ -329,7 +329,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, } void IMuseDigital::stopSound(int soundId) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::stopSound()"); debug(5, "IMuseDigital::stopSound(%d)", soundId); for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { if ((_track[l].soundId == soundId) && _track[l].used) { @@ -343,7 +343,7 @@ void IMuseDigital::stopSound(int soundId) { } void IMuseDigital::setVolume(int soundId, int volume) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::setVolume()"); debug(5, "IMuseDigital::setVolumeSound(%d, %d)", soundId, volume); for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { if ((_track[l].soundId == soundId) && _track[l].used) { @@ -353,7 +353,7 @@ void IMuseDigital::setVolume(int soundId, int volume) { } void IMuseDigital::setPan(int soundId, int pan) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::setPan()"); debug(5, "IMuseDigital::setVolumeSound(%d, %d)", soundId, pan); for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { if ((_track[l].soundId == soundId) && _track[l].used) { @@ -363,7 +363,7 @@ void IMuseDigital::setPan(int soundId, int pan) { } void IMuseDigital::setFade(int soundId, int destVolume, int delay60HzTicks) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::setFade()"); debug(5, "IMuseDigital::setFade(%d, %d, %d)", soundId, destVolume, delay60HzTicks); for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { if ((_track[l].soundId == soundId) && _track[l].used) { @@ -376,7 +376,7 @@ void IMuseDigital::setFade(int soundId, int destVolume, int delay60HzTicks) { } void IMuseDigital::stopAllSounds(bool waitForStop) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::stopAllSounds()"); debug(5, "IMuseDigital::stopAllSounds"); for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { if (_track[l].used) { @@ -401,7 +401,7 @@ void IMuseDigital::stopAllSounds(bool waitForStop) { } void IMuseDigital::fadeOutMusic(int fadeDelay) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::fadeOutMusic()"); debug(5, "IMuseDigital::fadeOutMusic"); for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { if ((_track[l].used) && (!_track[l].waitForEndSeq) && (_track[l].soundGroup == IMUSE_MUSIC) && (!_track[l].volFadeUsed)) { @@ -414,7 +414,7 @@ void IMuseDigital::fadeOutMusic(int fadeDelay) { } void IMuseDigital::pause(bool p) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::pause()"); for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { if (_track[l].used) { _vm->_mixer->pauseHandle(_track[l].handle, p); @@ -554,7 +554,7 @@ void IMuseDigital::parseScriptCmds(int a, int b, int c, int d, int e, int f, int } int IMuseDigital::getSoundStatus(int sound) const { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::getSoundStatus()"); debug(5, "IMuseDigital::getSoundStatus(%d)", sound); for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { if ((_track[l].soundId == sound) && _track[l].used) { @@ -608,7 +608,7 @@ int32 IMuseDigital::getPosInMs(int soundId) { } int32 IMuseDigital::getCurMusicPosInMs() { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::getCurMusicPosInMs()"); int soundId = -1; for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { @@ -623,7 +623,7 @@ int32 IMuseDigital::getCurMusicPosInMs() { } int32 IMuseDigital::getCurVoiceLipSyncWidth() { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::getCutVoiceLipSyncWidth()"); int32 msPos = getPosInMs(kTalkSoundID) + _vm->VAR(_vm->VAR_SYNC) + 50; int32 width = 0, height = 0; @@ -633,7 +633,7 @@ int32 IMuseDigital::getCurVoiceLipSyncWidth() { } int32 IMuseDigital::getCurVoiceLipSyncHeight() { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::getCurVoiceLipSyncHeight()"); int32 msPos = getPosInMs(kTalkSoundID) + _vm->VAR(_vm->VAR_SYNC) + 50; int32 width = 0, height = 0; @@ -643,7 +643,7 @@ int32 IMuseDigital::getCurVoiceLipSyncHeight() { } int32 IMuseDigital::getCurMusicLipSyncWidth(int syncId) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::getCurMusicLipSyncWidth()"); int soundId = -1; for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { @@ -661,7 +661,7 @@ int32 IMuseDigital::getCurMusicLipSyncWidth(int syncId) { } int32 IMuseDigital::getCurMusicLipSyncHeight(int syncId) { - Common::StackLock lock(_mutex); + Common::StackLock lock(_mutex, g_system, "IMuseDigital::getCurMusicLipSyncHeight()"); int soundId = -1; for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { |