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/sky | |
| 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/sky')
| -rw-r--r-- | engines/sky/intro.cpp | 6 | ||||
| -rw-r--r-- | engines/sky/sound.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index 6c50ea9804..55143d7f86 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -740,7 +740,7 @@ bool Intro::nextPart(uint16 *&data) { // probably use _skySound instead of calling playRaw() // directly, but this will have to do for now. memset(vData, 127, sizeof(struct dataFileHeader)); - _mixer->playRaw(&_voice, vData, _skyDisk->_lastLoadedFileSize, 11025, + _mixer->playRaw(Audio::Mixer::kSFXSoundType, &_voice, vData, _skyDisk->_lastLoadedFileSize, 11025, Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_UNSIGNED, SOUND_VOICE); return true; case WAITVOICE: @@ -757,12 +757,12 @@ bool Intro::nextPart(uint16 *&data) { return true; case LOOPBG: _mixer->stopID(SOUND_BG); - _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025, + _mixer->playRaw(Audio::Mixer::kSFXSoundType, &_bgSfx, _bgBuf + 256, _bgSize - 768, 11025, Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_LOOP, SOUND_BG); return true; case PLAYBG: _mixer->stopID(SOUND_BG); - _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025, + _mixer->playRaw(Audio::Mixer::kSFXSoundType, &_bgSfx, _bgBuf + 256, _bgSize - 768, 11025, Audio::Mixer::FLAG_UNSIGNED, SOUND_BG); return true; case STOPBG: diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index b2263482dd..edcfd81581 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -1040,7 +1040,7 @@ void Sound::playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *h memcpy(buffer, sound+sizeof(struct dataFileHeader), size); _mixer->stopID(id); - _mixer->playRaw(handle, buffer, size, 11025, flags, id); + _mixer->playRaw(Audio::Mixer::kSFXSoundType, handle, buffer, size, 11025, flags, id); } void Sound::loadSection(uint8 pSection) { @@ -1118,9 +1118,9 @@ void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) { } if (channel == 0) - _mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH0, volume, 0, loopSta, loopEnd); + _mixer->playRaw(Audio::Mixer::kSFXSoundType, &_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH0, volume, 0, loopSta, loopEnd); else - _mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH1, volume, 0, loopSta, loopEnd); + _mixer->playRaw(Audio::Mixer::kSFXSoundType, &_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH1, volume, 0, loopSta, loopEnd); } void Sound::fnStartFx(uint32 sound, uint8 channel) { @@ -1245,7 +1245,7 @@ bool Sound::startSpeech(uint16 textNum) { rate = 11025; _mixer->stopID(SOUND_SPEECH); - _mixer->playRaw(&_ingameSpeech, playBuffer, speechSize, rate, Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE, SOUND_SPEECH); + _mixer->playRaw(Audio::Mixer::kSFXSoundType, &_ingameSpeech, playBuffer, speechSize, rate, Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE, SOUND_SPEECH); return true; } |