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/tinsel | |
| 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/tinsel')
| -rw-r--r-- | engines/tinsel/bmv.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/music.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/sound.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index 7f3386edfa..f6e44cea1c 100644 --- a/engines/tinsel/bmv.cpp +++ b/engines/tinsel/bmv.cpp @@ -459,7 +459,7 @@ void BMVPlayer::MovieAudio(int audioOffset, int blobs) { if (currentSoundFrame == ADVANCE_SOUND) { if (!audioStarted) { - _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, + _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_audioHandle, _audioStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO); audioStarted = true; } diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 7763058963..f282d133a0 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -570,7 +570,7 @@ PCMMusicPlayer::PCMMusicPlayer() { _end = true; - _vm->_mixer->playInputStream(Audio::Mixer::kMusicSoundType, + _vm->_mixer->playStream(Audio::Mixer::kMusicSoundType, &_handle, this, -1, _volume, 0, DisposeAfterUse::NO, true); } diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 370b2e0a82..bb0e251b52 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -117,7 +117,7 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_config->_voiceVolume); // Play the audio stream - _vm->_mixer->playInputStream(type, &curChan.handle, vagStream); + _vm->_mixer->playStream(type, &curChan.handle, vagStream); } else { // allocate a buffer byte *sampleBuf = (byte *)malloc(sampleLen); @@ -158,7 +158,7 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound break; } if (sampleStream) { - _vm->_mixer->playInputStream(type, &curChan.handle, sampleStream); + _vm->_mixer->playStream(type, &curChan.handle, sampleStream); } } @@ -324,7 +324,7 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p //curChan->timeDuration = (((sampleLen * 64) / 25) * 1000) / (22050 * 2); // Play it - _vm->_mixer->playInputStream(type, &curChan->handle, sampleStream); + _vm->_mixer->playStream(type, &curChan->handle, sampleStream); _vm->_mixer->setChannelVolume(curChan->handle, sndVol); _vm->_mixer->setChannelBalance(curChan->handle, getPan(x)); |