diff options
| author | Max Horn | 2010-04-12 09:14:17 +0000 |
|---|---|---|
| committer | Max Horn | 2010-04-12 09:14:17 +0000 |
| commit | a1840bd5732473e3144857c74716ec2d6e4338c2 (patch) | |
| tree | 97a63044cc6cf8617172af41857b6e19fa324d20 /engines/scumm/he | |
| parent | 9191b9d5289b99b197fee8b9234080d03d2194c3 (diff) | |
| download | scummvm-rg350-a1840bd5732473e3144857c74716ec2d6e4338c2.tar.gz scummvm-rg350-a1840bd5732473e3144857c74716ec2d6e4338c2.tar.bz2 scummvm-rg350-a1840bd5732473e3144857c74716ec2d6e4338c2.zip | |
AUDIO: Rename Mixer::playInputStream to playStream
svn-id: r48637
Diffstat (limited to 'engines/scumm/he')
| -rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index 17483b6bd9..87afe5fd90 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -169,7 +169,7 @@ void CUP_Player::updateSfx() { uint8 *soundData = _sfxBuffer + offset; if (READ_BE_UINT32(soundData) == MKID_BE('DATA')) { uint32 soundSize = READ_BE_UINT32(soundData + 4); - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle, + _mixer->playStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle, Audio::makeLoopingAudioStream( Audio::makeRawStream(soundData + 8, soundSize - 8, 11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO), diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index 97c192cec5..7bfd1de4cf 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -575,7 +575,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) if (_vm->_game.heversion == 70) { stream = Audio::makeRawStream(spoolPtr, size, 11025, flags, DisposeAfterUse::NO); - _mixer->playInputStream(type, &_heSoundChannels[heChannel], stream, soundID); + _mixer->playStream(type, &_heSoundChannels[heChannel], stream, soundID); return; } } @@ -671,7 +671,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) } else { stream = Audio::makeRawStream(ptr + memStream.pos() + heOffset, size - heOffset, rate, flags, DisposeAfterUse::NO); } - _mixer->playInputStream(type, &_heSoundChannels[heChannel], + _mixer->playStream(type, &_heSoundChannels[heChannel], Audio::makeLoopingAudioStream(stream, (heFlags & 1) ? 0 : 1), soundID); } // Support for sound in Humongous Entertainment games @@ -730,7 +730,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) _mixer->stopHandle(_heSoundChannels[heChannel]); stream = Audio::makeRawStream(ptr + heOffset + 8, size, rate, flags, DisposeAfterUse::NO); - _mixer->playInputStream(type, &_heSoundChannels[heChannel], + _mixer->playStream(type, &_heSoundChannels[heChannel], Audio::makeLoopingAudioStream(stream, (heFlags & 1) ? 0 : 1), soundID); } // Support for PCM music in 3DO versions of Humongous Entertainment games @@ -751,7 +751,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) _currentMusic = soundID; stream = Audio::makeRawStream(sound, size, rate, 0); - _mixer->playInputStream(Audio::Mixer::kMusicSoundType, NULL, stream, soundID); + _mixer->playStream(Audio::Mixer::kMusicSoundType, NULL, stream, soundID); } else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) { if (_vm->_imuse) { |