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/sci | |
| 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/sci')
| -rw-r--r-- | engines/sci/sound/audio.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/drivers/adlib.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/drivers/amiga.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/drivers/pcjr.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/iterator/core.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/music.cpp | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index 9502b279ae..935427c51a 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -61,7 +61,7 @@ int AudioPlayer::startAudio(uint16 module, uint32 number) { Audio::AudioStream *audioStream = getAudioStream(number, module, &sampleLen); if (audioStream) { - _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_audioHandle, audioStream); + _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_audioHandle, audioStream); return sampleLen; } diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp index a8733dc0a2..a743e4b5d9 100644 --- a/engines/sci/sound/drivers/adlib.cpp +++ b/engines/sci/sound/drivers/adlib.cpp @@ -238,7 +238,7 @@ int MidiDriver_AdLib::open(bool isSCI0) { MidiDriver_Emulated::open(); - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO); + _mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO); return 0; } diff --git a/engines/sci/sound/drivers/amiga.cpp b/engines/sci/sound/drivers/amiga.cpp index b9fb17b84d..0413dbb79e 100644 --- a/engines/sci/sound/drivers/amiga.cpp +++ b/engines/sci/sound/drivers/amiga.cpp @@ -541,7 +541,7 @@ int MidiDriver_Amiga::open() { MidiDriver_Emulated::open(); - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO); + _mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO); return Common::kNoError; } diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp index 420007b698..e2544869ac 100644 --- a/engines/sci/sound/drivers/pcjr.cpp +++ b/engines/sci/sound/drivers/pcjr.cpp @@ -221,7 +221,7 @@ int MidiDriver_PCJr::open(int channels) { MidiDriver_Emulated::open(); - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO); + _mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO); return 0; } diff --git a/engines/sci/sound/iterator/core.cpp b/engines/sci/sound/iterator/core.cpp index 7e5b690c08..7cd730b3e2 100644 --- a/engines/sci/sound/iterator/core.cpp +++ b/engines/sci/sound/iterator/core.cpp @@ -639,7 +639,7 @@ static int sfx_play_iterator_pcm(SongIterator *it, SongHandle handle) { if (g_system->getMixer()->isReady()) { Audio::AudioStream *newfeed = it->getAudioStream(); if (newfeed) { - g_system->getMixer()->playInputStream(Audio::Mixer::kSFXSoundType, 0, newfeed); + g_system->getMixer()->playStream(Audio::Mixer::kSFXSoundType, 0, newfeed); return 1; } } diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 7915395e9a..f8b02f5a58 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -256,11 +256,11 @@ void SciMusic::soundPlay(MusicEntry *pSnd) { if (pSnd->loop > 1) { pSnd->pLoopStream = new Audio::LoopingAudioStream(pSnd->pStreamAud, pSnd->loop, DisposeAfterUse::NO); - _pMixer->playInputStream(pSnd->soundType, &pSnd->hCurrentAud, + _pMixer->playStream(pSnd->soundType, &pSnd->hCurrentAud, pSnd->pLoopStream, -1, pSnd->volume, 0, DisposeAfterUse::NO); } else { - _pMixer->playInputStream(pSnd->soundType, &pSnd->hCurrentAud, + _pMixer->playStream(pSnd->soundType, &pSnd->hCurrentAud, pSnd->pStreamAud, -1, pSnd->volume, 0, DisposeAfterUse::NO); } |