aboutsummaryrefslogtreecommitdiff
path: root/engines/agos
diff options
context:
space:
mode:
authorMax Horn2010-04-12 09:14:17 +0000
committerMax Horn2010-04-12 09:14:17 +0000
commita1840bd5732473e3144857c74716ec2d6e4338c2 (patch)
tree97a63044cc6cf8617172af41857b6e19fa324d20 /engines/agos
parent9191b9d5289b99b197fee8b9234080d03d2194c3 (diff)
downloadscummvm-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/agos')
-rw-r--r--engines/agos/animation.cpp2
-rw-r--r--engines/agos/res_snd.cpp2
-rw-r--r--engines/agos/sound.cpp12
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index 0859bc9da3..8155bfb8d9 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -313,7 +313,7 @@ void MoviePlayerDXA::startSound() {
if (_bgSoundStream != NULL) {
_vm->_mixer->stopHandle(_bgSound);
- _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSound, _bgSoundStream);
+ _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_bgSound, _bgSoundStream);
}
}
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index 00d677727d..06dfab1ecd 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -221,7 +221,7 @@ void AGOSEngine::playModule(uint16 music) {
audioStream = Audio::makeProtrackerStream(&f);
}
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_modHandle, audioStream);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_modHandle, audioStream);
}
void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) {
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index 84b0eebe69..bd4c89a404 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -242,7 +242,7 @@ Audio::AudioStream *WavSound::makeAudioStream(uint sound) {
void WavSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
convertVolume(vol);
- _mixer->playInputStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
+ _mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
}
///////////////////////////////////////////////////////////////////////////////
@@ -265,7 +265,7 @@ Audio::AudioStream *VocSound::makeAudioStream(uint sound) {
void VocSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
convertVolume(vol);
- _mixer->playInputStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
+ _mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
}
///////////////////////////////////////////////////////////////////////////////
@@ -297,7 +297,7 @@ Audio::AudioStream *RawSound::makeAudioStream(uint sound) {
void RawSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
// Sound looping and volume are ignored.
- _mixer->playInputStream(type, handle, makeAudioStream(sound));
+ _mixer->playStream(type, handle, makeAudioStream(sound));
}
///////////////////////////////////////////////////////////////////////////////
@@ -324,7 +324,7 @@ public:
void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0) {
convertVolume(vol);
- _mixer->playInputStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
+ _mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
}
};
@@ -738,7 +738,7 @@ void Sound::playRawData(byte *soundData, uint sound, uint size, uint freq) {
flags = Audio::FLAG_UNSIGNED;
Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, freq, flags);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_effectsHandle, stream);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_effectsHandle, stream);
}
// Feeble Files specific
@@ -783,7 +783,7 @@ void Sound::playSoundData(Audio::SoundHandle *handle, byte *soundData, uint soun
convertVolume(vol);
convertPan(pan);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, Audio::makeLoopingAudioStream(sndStream, loop ? 0 : 1), -1, vol, pan);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, handle, Audio::makeLoopingAudioStream(sndStream, loop ? 0 : 1), -1, vol, pan);
}
void Sound::stopSfx5() {