[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.43,1.44

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv329/scumm/imuse_digi

Modified Files:
	dimuse.cpp 
Log Message:
Add mutex tracking to make it easier to debug imuse deadlocks


Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- dimuse.cpp	13 Feb 2004 06:43:10 -0000	1.43
+++ dimuse.cpp	14 Feb 2004 08:56:26 -0000	1.44
@@ -65,7 +65,7 @@
 }
 
 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::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::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::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::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::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::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::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::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 @@
 }
 
 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::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::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::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::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::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++) {