aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_digi
diff options
context:
space:
mode:
authorMax Horn2004-01-30 20:49:26 +0000
committerMax Horn2004-01-30 20:49:26 +0000
commitc7424312c32d6cc27c3b052720ad252e94f28c37 (patch)
tree5b432743030b42aa20cc9b3d7655e38a5f2d5d4f /scumm/imuse_digi
parent4dab40f1233eba825aa9c5834b135403f922c8c4 (diff)
downloadscummvm-rg350-c7424312c32d6cc27c3b052720ad252e94f28c37.tar.gz
scummvm-rg350-c7424312c32d6cc27c3b052720ad252e94f28c37.tar.bz2
scummvm-rg350-c7424312c32d6cc27c3b052720ad252e94f28c37.zip
improved debug message; code simplification
svn-id: r12677
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r--scumm/imuse_digi/dimuse.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 24f4393172..611790376d 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -274,10 +274,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType,
_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::stopSound(int soundId) {
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::setVolume(int soundId, int volume) {
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;