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/saga | |
| 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/saga')
| -rw-r--r-- | engines/saga/music.cpp | 6 | ||||
| -rw-r--r-- | engines/saga/sound.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 55ced7fff5..23568853aa 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -280,7 +280,7 @@ void Music::play(uint32 resourceId, MusicFlags flags) { for (int i = 0; i < 2; ++i) { stream = Audio::SeekableAudioStream::openStreamFile(trackName[i]); if (stream) { - _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, + _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, Audio::makeLoopingAudioStream(stream, (flags == MUSIC_LOOP) ? 0 : 1)); _digitalMusic = true; return; @@ -343,13 +343,13 @@ void Music::play(uint32 resourceId, MusicFlags flags) { if (audioStream) { debug(2, "Playing digitized music"); if (loopStart) { - _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, + _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, new Audio::SubLoopingAudioStream(audioStream, (flags == MUSIC_LOOP ? 0 : 1), Audio::Timestamp(0, loopStart, audioStream->getRate()), audioStream->getLength())); } else { - _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, + _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, Audio::makeLoopingAudioStream(audioStream, (flags == MUSIC_LOOP ? 0 : 1))); } _digitalMusic = true; diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp index c369ec169f..811ee709f7 100644 --- a/engines/saga/sound.cpp +++ b/engines/saga/sound.cpp @@ -102,7 +102,7 @@ void Sound::playSoundBuffer(Audio::SoundHandle *handle, const SoundBuffer &buffe } if (stream != NULL) - _mixer->playInputStream(soundType, handle, Audio::makeLoopingAudioStream(stream, loop ? 0 : 1), -1, volume); + _mixer->playStream(soundType, handle, Audio::makeLoopingAudioStream(stream, loop ? 0 : 1), -1, volume); } void Sound::playSound(SoundBuffer &buffer, int volume, bool loop) { |