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

[Max Horn]

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

Modified Files:
	dimuse.cpp 
Log Message:
improved debug message; code simplification

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- dimuse.cpp	29 Jan 2004 18:15:27 -0000	1.41
+++ dimuse.cpp	30 Jan 2004 20:49:26 -0000	1.42
@@ -274,10 +274,7 @@
 				_track[l].iteration = 1; // ?
 				// Do nothing here, we already have an audio stream
 			} else {
-				if (soundName == NULL)
-					_track[l].soundHandle = _sound->openSound(soundId, NULL, soundType, soundGroup);
-				else
-					_track[l].soundHandle = _sound->openSound(soundId, soundName, soundType, soundGroup);
+				_track[l].soundHandle = _sound->openSound(soundId, soundName, soundType, soundGroup);
 
 				if (_track[l].soundHandle == NULL)
 					return;
@@ -338,7 +335,7 @@
 
 void IMuseDigital::setVolume(int soundId, int volume) {
 	Common::StackLock lock(_mutex);
-	debug(5, "IMuseDigital::setVolumeSound(%d)", soundId);
+	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) {
 			_track[l].vol = volume * 1000;
@@ -348,7 +345,7 @@
 
 void IMuseDigital::setPan(int soundId, int pan) {
 	Common::StackLock lock(_mutex);
-	debug(5, "IMuseDigital::setVolumeSound(%d)", soundId);
+	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) {
 			_track[l].pan = pan;