diff options
Diffstat (limited to 'engines/sky')
| -rw-r--r-- | engines/sky/intro.cpp | 8 | ||||
| -rw-r--r-- | engines/sky/music/adlibmusic.cpp | 2 | ||||
| -rw-r--r-- | engines/sky/sound.cpp | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index 5114162a61..68e84d616d 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -735,12 +735,12 @@ bool Intro::nextPart(uint16 *&data) { return false; vData = _skyDisk->loadFile(*data++); // HACK: Fill the header with silence. We should - // probably use _skySound instead of calling playInputStream() + // probably use _skySound instead of calling playStream() // directly, but this will have to do for now. memset(vData, 127, sizeof(DataFileHeader)); stream = Audio::makeRawStream(vData, _skyDisk->_lastLoadedFileSize, 11025, Audio::FLAG_UNSIGNED); - _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_voice, stream, SOUND_VOICE); + _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_voice, stream, SOUND_VOICE); return true; case WAITVOICE: while (_mixer->isSoundHandleActive(_voice)) @@ -756,12 +756,12 @@ bool Intro::nextPart(uint16 *&data) { case LOOPBG: _mixer->stopID(SOUND_BG); stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO); - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, Audio::makeLoopingAudioStream(stream, 0), SOUND_BG); + _mixer->playStream(Audio::Mixer::kSFXSoundType, &_bgSfx, Audio::makeLoopingAudioStream(stream, 0), SOUND_BG); return true; case PLAYBG: _mixer->stopID(SOUND_BG); stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO); - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, stream, SOUND_BG); + _mixer->playStream(Audio::Mixer::kSFXSoundType, &_bgSfx, stream, SOUND_BG); return true; case STOPBG: _mixer->stopID(SOUND_BG); diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index f8b3cb480c..0b593f555b 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -40,7 +40,7 @@ AdLibMusic::AdLibMusic(Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pDisk) { _opl = makeAdLibOPL(_sampleRate); - _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); + _mixer->playStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); } AdLibMusic::~AdLibMusic() { diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 179bb5e37a..dc76cb8f0d 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -1046,7 +1046,7 @@ void Sound::playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *h _mixer->stopID(id); Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, 11025, flags); - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, stream, id); + _mixer->playStream(Audio::Mixer::kSFXSoundType, handle, stream, id); } void Sound::loadSection(uint8 pSection) { @@ -1126,9 +1126,9 @@ void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) { } if (channel == 0) - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_ingameSound0, output, SOUND_CH0, volume, 0); + _mixer->playStream(Audio::Mixer::kSFXSoundType, &_ingameSound0, output, SOUND_CH0, volume, 0); else - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_ingameSound1, output, SOUND_CH1, volume, 0); + _mixer->playStream(Audio::Mixer::kSFXSoundType, &_ingameSound1, output, SOUND_CH1, volume, 0); } void Sound::fnStartFx(uint32 sound, uint8 channel) { @@ -1252,7 +1252,7 @@ bool Sound::startSpeech(uint16 textNum) { _mixer->stopID(SOUND_SPEECH); Audio::AudioStream *stream = Audio::makeRawStream(playBuffer, speechSize, rate, Audio::FLAG_UNSIGNED); - _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_ingameSpeech, stream, SOUND_SPEECH); + _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_ingameSpeech, stream, SOUND_SPEECH); return true; } |