aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorMax Horn2003-09-05 21:06:32 +0000
committerMax Horn2003-09-05 21:06:32 +0000
commit06b6ff9a44b847423ee611d92dbf8c5fbe583499 (patch)
tree63e3fcf63e2edac6f1a5b1694c00ce92733a2a8e /simon
parent11193b0746b0ac2962c98255663dd1beef3fc2a1 (diff)
downloadscummvm-rg350-06b6ff9a44b847423ee611d92dbf8c5fbe583499.tar.gz
scummvm-rg350-06b6ff9a44b847423ee611d92dbf8c5fbe583499.tar.bz2
scummvm-rg350-06b6ff9a44b847423ee611d92dbf8c5fbe583499.zip
added default volume/pan values
svn-id: r10019
Diffstat (limited to 'simon')
-rw-r--r--simon/sound.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp
index 4651157458..2aca4b955c 100644
--- a/simon/sound.cpp
+++ b/simon/sound.cpp
@@ -174,7 +174,7 @@ int WavSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
byte *buffer = (byte *)malloc(data[1]);
_file->read(buffer, data[1]);
- return _mixer->playRaw(handle, buffer, data[1], FROM_LE_32(wave_hdr.samples_per_sec), flags, 255, 0);
+ return _mixer->playRaw(handle, buffer, data[1], FROM_LE_32(wave_hdr.samples_per_sec), flags);
}
int VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
@@ -212,7 +212,7 @@ int VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
byte *buffer = (byte *)malloc(size);
_file->read(buffer, size);
- return _mixer->playRaw(handle, buffer, size, samples_per_sec, flags, 255, 0);
+ return _mixer->playRaw(handle, buffer, size, samples_per_sec, flags);
}
int RawSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
@@ -226,7 +226,7 @@ int RawSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
byte *buffer = (byte *)malloc(size);
_file->read(buffer, size);
- return _mixer->playRaw(handle, buffer, size, 22050, flags, 255, 0);
+ return _mixer->playRaw(handle, buffer, size, 22050, flags);
}
#ifdef USE_MAD
@@ -245,7 +245,7 @@ int MP3Sound::playSound(uint sound, PlayingSoundHandle *handle, byte flags)
uint32 size = _offsets[sound+1] - _offsets[sound];
- return _mixer->playMP3(handle, _file, size, 255, 0);
+ return _mixer->playMP3(handle, _file, size);
}
#endif