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/made | |
| 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/made')
| -rw-r--r-- | engines/made/pmvplayer.cpp | 2 | ||||
| -rw-r--r-- | engines/made/scriptfuncs.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/made/pmvplayer.cpp b/engines/made/pmvplayer.cpp index 20237501d9..a21d767998 100644 --- a/engines/made/pmvplayer.cpp +++ b/engines/made/pmvplayer.cpp @@ -175,7 +175,7 @@ bool PmvPlayer::play(const char *filename) { decompressMovieImage(imageData, *_surface, cmdOffs, pixelOffs, maskOffs, lineSize); if (firstTime) { - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle, _audioStream); + _mixer->playStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle, _audioStream); soundStartTime = g_system->getMillis(); skipFrames = 0; firstTime = false; diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp index 349fc23468..cd4081ea52 100644 --- a/engines/made/scriptfuncs.cpp +++ b/engines/made/scriptfuncs.cpp @@ -239,7 +239,7 @@ int16 ScriptFunctions::sfPlaySound(int16 argc, int16 *argv) { } if (soundNum > 0) { SoundResource *soundRes = _vm->_res->getSound(soundNum); - _vm->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle, + _vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle, soundRes->getAudioStream(_vm->_soundRate, false)); _vm->_soundEnergyArray = soundRes->getSoundEnergyArray(); _vm->_soundEnergyIndex = 0; @@ -586,7 +586,7 @@ int16 ScriptFunctions::sfPlayVoice(int16 argc, int16 *argv) { stopSound(); if (soundNum > 0) { _soundResource = _vm->_res->getSound(soundNum); - _vm->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle, + _vm->_mixer->playStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle, _soundResource->getAudioStream(_vm->_soundRate, false)); _vm->_autoStopSound = true; _soundStarted = true; |