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/mohawk | |
| 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/mohawk')
| -rw-r--r-- | engines/mohawk/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/mohawk/video/qt_player.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index d6582f62a1..b84573f011 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -140,7 +140,7 @@ Audio::SoundHandle *Sound::playSound(uint16 id, bool mainSoundFile, byte volume, if (loop) audStream = Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audStream, 0); - _vm->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &handle->handle, audStream, -1, volume); + _vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, &handle->handle, audStream, -1, volume); return &handle->handle; } @@ -308,7 +308,7 @@ void Sound::playSLSTSound(uint16 id, bool fade, bool loop, uint16 volume, int16 // TODO: Handle fading, possibly just raise the volume of the channel in increments? - _vm->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, sndHandle.handle, audStream, -1, volume, convertBalance(balance)); + _vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, sndHandle.handle, audStream, -1, volume, convertBalance(balance)); } void Sound::stopSLSTSound(uint16 index, bool fade) { diff --git a/engines/mohawk/video/qt_player.cpp b/engines/mohawk/video/qt_player.cpp index c7062124f6..803da4f5f1 100644 --- a/engines/mohawk/video/qt_player.cpp +++ b/engines/mohawk/video/qt_player.cpp @@ -191,7 +191,7 @@ void QTPlayer::startAudio() { if (!_audStream) // No audio/audio not supported return; - g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &_audHandle, _audStream); + g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType, &_audHandle, _audStream); } void QTPlayer::pauseAudio() { |