diff options
| author | Max Horn | 2004-11-28 23:02:28 +0000 |
|---|---|---|
| committer | Max Horn | 2004-11-28 23:02:28 +0000 |
| commit | 10dd548b854682d7a98bae91db7af4cc008db525 (patch) | |
| tree | 6bd06307e62059e9d72162a1b27d6d23c9c01f91 /sword1 | |
| parent | 61440ca8304efc2e375cc46bdc06f9028d785ce7 (diff) | |
| download | scummvm-rg350-10dd548b854682d7a98bae91db7af4cc008db525.tar.gz scummvm-rg350-10dd548b854682d7a98bae91db7af4cc008db525.tar.bz2 scummvm-rg350-10dd548b854682d7a98bae91db7af4cc008db525.zip | |
Changed parameter order of SoundMixer::playInputStream to match that of playRaw
svn-id: r15950
Diffstat (limited to 'sword1')
| -rw-r--r-- | sword1/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sword1/sound.cpp b/sword1/sound.cpp index c9b5806f5a..e409af5e02 100644 --- a/sword1/sound.cpp +++ b/sword1/sound.cpp @@ -194,7 +194,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { #ifdef USE_MAD else if (_cowMode == CowMp3) { _cowFile.seek(index); - _mixer->playInputStream(&_speechHandle, makeMP3Stream(&_cowFile, sampleSize), false, speechVol, speechPan, SOUND_SPEECH_ID); + _mixer->playInputStream(&_speechHandle, makeMP3Stream(&_cowFile, sampleSize), false, SOUND_SPEECH_ID, speechVol, speechPan); // with compressed audio, we can't calculate the wave volume. // so default to talking. for (int cnt = 0; cnt < 480; cnt++) @@ -205,7 +205,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { #ifdef USE_VORBIS else if (_cowMode == CowVorbis) { _cowFile.seek(index); - _mixer->playInputStream(&_speechHandle, makeVorbisStream(&_cowFile, sampleSize), false, speechVol, speechPan, SOUND_SPEECH_ID); + _mixer->playInputStream(&_speechHandle, makeVorbisStream(&_cowFile, sampleSize), false, SOUND_SPEECH_ID, speechVol, speechPan); for (int cnt = 0; cnt < 480; cnt++) _waveVolume[cnt] = true; _waveVolPos = 0; |