diff options
| author | Max Horn | 2007-02-03 19:05:53 +0000 |
|---|---|---|
| committer | Max Horn | 2007-02-03 19:05:53 +0000 |
| commit | cb49cbdd456a97c6e10bdc279624603bd9bd7b60 (patch) | |
| tree | d1ef8edbfbe237973b6cdef96434a17c24c9c122 /engines/sword2 | |
| parent | 9c5e62fb0408aeae98dcc9124c7090453768879d (diff) | |
| download | scummvm-rg350-cb49cbdd456a97c6e10bdc279624603bd9bd7b60.tar.gz scummvm-rg350-cb49cbdd456a97c6e10bdc279624603bd9bd7b60.tar.bz2 scummvm-rg350-cb49cbdd456a97c6e10bdc279624603bd9bd7b60.zip | |
* Reimplemented Mixer::pauseAll to simply invoke pause on all channels
(implying change of semantics)
* Reordered the params of Mixer::playRaw (the SoundType now comes first, not last)
* Removed Mixer::isPaused
* Removed Mixer::getSoundElapsedTimeOfSoundID
* Added some doxygen comments to the Mixer
svn-id: r25356
Diffstat (limited to 'engines/sword2')
| -rw-r--r-- | engines/sword2/animation.cpp | 2 | ||||
| -rw-r--r-- | engines/sword2/sound.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 3f9cbb482e..838c37dc6e 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -351,7 +351,7 @@ void MoviePlayer::play(int32 leadIn, int32 leadOut) { } if (startNextText && !_mixer->isSoundHandleActive(_speechHandle)) { - _mixer->playRaw(&_speechHandle, t->speech, t->speechBufferSize, 22050, flags); + _mixer->playRaw(Audio::Mixer::kSFXSoundType, &_speechHandle, t->speech, t->speechBufferSize, 22050, flags); startNextText = false; } diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index 561b7dc45e..b1de94f3ad 100644 --- a/engines/sword2/sound.cpp +++ b/engines/sword2/sound.cpp @@ -311,7 +311,7 @@ int32 Sound::playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vo if (loop) flags |= Audio::Mixer::FLAG_LOOP; - _vm->_mixer->playRaw(handle, data + stream.pos(), size, rate, flags, -1, vol, pan, 0, 0, soundType); + _vm->_mixer->playRaw(soundType, handle, data + stream.pos(), size, rate, flags, -1, vol, pan, 0, 0); return RD_OK; } |