[Scummvm-cvs-logs] SF.net SVN: scummvm:[48637] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Apr 12 11:14:18 CEST 2010
Revision: 48637
http://scummvm.svn.sourceforge.net/scummvm/?rev=48637&view=rev
Author: fingolfin
Date: 2010-04-12 09:14:17 +0000 (Mon, 12 Apr 2010)
Log Message:
-----------
AUDIO: Rename Mixer::playInputStream to playStream
Modified Paths:
--------------
scummvm/trunk/engines/agi/preagi.cpp
scummvm/trunk/engines/agi/sound.cpp
scummvm/trunk/engines/agos/animation.cpp
scummvm/trunk/engines/agos/res_snd.cpp
scummvm/trunk/engines/agos/sound.cpp
scummvm/trunk/engines/cine/sound.cpp
scummvm/trunk/engines/cruise/sound.cpp
scummvm/trunk/engines/draci/sound.cpp
scummvm/trunk/engines/drascula/sound.cpp
scummvm/trunk/engines/gob/sound/adlib.cpp
scummvm/trunk/engines/gob/sound/infogrames.cpp
scummvm/trunk/engines/gob/sound/pcspeaker.cpp
scummvm/trunk/engines/gob/sound/protracker.cpp
scummvm/trunk/engines/gob/sound/soundmixer.cpp
scummvm/trunk/engines/groovie/roq.cpp
scummvm/trunk/engines/groovie/vdx.cpp
scummvm/trunk/engines/kyra/sound.cpp
scummvm/trunk/engines/kyra/sound_adlib.cpp
scummvm/trunk/engines/kyra/sound_amiga.cpp
scummvm/trunk/engines/kyra/sound_digital.cpp
scummvm/trunk/engines/kyra/sound_pcspk.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/kyra/vqa.cpp
scummvm/trunk/engines/m4/sound.cpp
scummvm/trunk/engines/made/pmvplayer.cpp
scummvm/trunk/engines/made/scriptfuncs.cpp
scummvm/trunk/engines/mohawk/sound.cpp
scummvm/trunk/engines/mohawk/video/qt_player.cpp
scummvm/trunk/engines/parallaction/sound_br.cpp
scummvm/trunk/engines/parallaction/sound_ns.cpp
scummvm/trunk/engines/queen/midiadlib.cpp
scummvm/trunk/engines/queen/sound.cpp
scummvm/trunk/engines/saga/music.cpp
scummvm/trunk/engines/saga/sound.cpp
scummvm/trunk/engines/sci/sound/audio.cpp
scummvm/trunk/engines/sci/sound/drivers/adlib.cpp
scummvm/trunk/engines/sci/sound/drivers/amiga.cpp
scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
scummvm/trunk/engines/sci/sound/iterator/core.cpp
scummvm/trunk/engines/sci/sound/music.cpp
scummvm/trunk/engines/scumm/he/cup_player_he.cpp
scummvm/trunk/engines/scumm/he/sound_he.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
scummvm/trunk/engines/scumm/player_mod.cpp
scummvm/trunk/engines/scumm/player_nes.cpp
scummvm/trunk/engines/scumm/player_pce.cpp
scummvm/trunk/engines/scumm/player_sid.cpp
scummvm/trunk/engines/scumm/player_v2.cpp
scummvm/trunk/engines/scumm/player_v2cms.cpp
scummvm/trunk/engines/scumm/player_v4a.cpp
scummvm/trunk/engines/scumm/smush/smush_mixer.cpp
scummvm/trunk/engines/scumm/smush/smush_player.cpp
scummvm/trunk/engines/scumm/sound.cpp
scummvm/trunk/engines/sky/intro.cpp
scummvm/trunk/engines/sky/music/adlibmusic.cpp
scummvm/trunk/engines/sky/sound.cpp
scummvm/trunk/engines/sword1/animation.cpp
scummvm/trunk/engines/sword1/music.cpp
scummvm/trunk/engines/sword1/sound.cpp
scummvm/trunk/engines/sword2/animation.cpp
scummvm/trunk/engines/sword2/music.cpp
scummvm/trunk/engines/sword2/sound.cpp
scummvm/trunk/engines/teenagent/teenagent.cpp
scummvm/trunk/engines/tinsel/bmv.cpp
scummvm/trunk/engines/tinsel/music.cpp
scummvm/trunk/engines/tinsel/sound.cpp
scummvm/trunk/engines/touche/resource.cpp
scummvm/trunk/engines/tucker/resource.cpp
scummvm/trunk/engines/tucker/sequences.cpp
scummvm/trunk/graphics/video/avi_decoder.cpp
scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
scummvm/trunk/graphics/video/smk_decoder.cpp
scummvm/trunk/sound/audiocd.cpp
scummvm/trunk/sound/mixer.cpp
scummvm/trunk/sound/mixer.h
scummvm/trunk/sound/mixer_intern.h
scummvm/trunk/sound/softsynth/adlib.cpp
scummvm/trunk/sound/softsynth/fluidsynth.cpp
scummvm/trunk/sound/softsynth/mt32.cpp
scummvm/trunk/sound/softsynth/ym2612.cpp
Modified: scummvm/trunk/engines/agi/preagi.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/agi/preagi.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -118,7 +118,7 @@
//_sound->initSound();
_speakerStream = new Audio::PCSpeaker(_mixer->getOutputRate());
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_speakerHandle,
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_speakerHandle,
_speakerStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/agi/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -487,7 +487,7 @@
report("disabled\n");
}
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
return r;
}
Modified: scummvm/trunk/engines/agos/animation.cpp
===================================================================
--- scummvm/trunk/engines/agos/animation.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/agos/animation.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -313,7 +313,7 @@
if (_bgSoundStream != NULL) {
_vm->_mixer->stopHandle(_bgSound);
- _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSound, _bgSoundStream);
+ _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_bgSound, _bgSoundStream);
}
}
Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/agos/res_snd.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -221,7 +221,7 @@
audioStream = Audio::makeProtrackerStream(&f);
}
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_modHandle, audioStream);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_modHandle, audioStream);
}
void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) {
Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/agos/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -242,7 +242,7 @@
void WavSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
convertVolume(vol);
- _mixer->playInputStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
+ _mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
}
///////////////////////////////////////////////////////////////////////////////
@@ -265,7 +265,7 @@
void VocSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
convertVolume(vol);
- _mixer->playInputStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
+ _mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
}
///////////////////////////////////////////////////////////////////////////////
@@ -297,7 +297,7 @@
void RawSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
// Sound looping and volume are ignored.
- _mixer->playInputStream(type, handle, makeAudioStream(sound));
+ _mixer->playStream(type, handle, makeAudioStream(sound));
}
///////////////////////////////////////////////////////////////////////////////
@@ -324,7 +324,7 @@
void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0) {
convertVolume(vol);
- _mixer->playInputStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
+ _mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
}
};
@@ -738,7 +738,7 @@
flags = Audio::FLAG_UNSIGNED;
Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, freq, flags);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_effectsHandle, stream);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_effectsHandle, stream);
}
// Feeble Files specific
@@ -783,7 +783,7 @@
convertVolume(vol);
convertPan(pan);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, Audio::makeLoopingAudioStream(sndStream, loop ? 0 : 1), -1, vol, pan);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, handle, Audio::makeLoopingAudioStream(sndStream, loop ? 0 : 1), -1, vol, pan);
}
void Sound::stopSfx5() {
Modified: scummvm/trunk/engines/cine/sound.cpp
===================================================================
--- scummvm/trunk/engines/cine/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/cine/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -245,7 +245,7 @@
memset(_channelsVolumeTable, 0, sizeof(_channelsVolumeTable));
memset(_instrumentsTable, 0, sizeof(_instrumentsTable));
initCard();
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
AdLibSoundDriver::~AdLibSoundDriver() {
@@ -802,7 +802,7 @@
debugC(5, kCineDebugSound, "PaulaSound::playMusic()");
_mixer->stopHandle(_moduleHandle);
if (_moduleStream) {
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_moduleHandle, _moduleStream);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_moduleHandle, _moduleStream);
}
}
@@ -846,7 +846,7 @@
assert(frequency > 0);
frequency = PAULA_FREQ / frequency;
Audio::AudioStream *stream = Audio::makeRawStream(data, size, frequency, 0);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_channelsTable[channel], stream);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_channelsTable[channel], stream);
_mixer->setChannelVolume(_channelsTable[channel], volume * Audio::Mixer::kMaxChannelVolume / 63);
}
Modified: scummvm/trunk/engines/cruise/sound.cpp
===================================================================
--- scummvm/trunk/engines/cruise/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/cruise/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -298,7 +298,7 @@
}
memset(_instrumentsTable, 0, sizeof(_instrumentsTable));
initCard();
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
_musicVolume = ConfMan.getBool("music_mute") ? 0 : MIN(255, ConfMan.getInt("music_volume"));
_sfxVolume = ConfMan.getBool("sfx_mute") ? 0 : MIN(255, ConfMan.getInt("sfx_volume"));
Modified: scummvm/trunk/engines/draci/sound.cpp
===================================================================
--- scummvm/trunk/engines/draci/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/draci/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -204,7 +204,7 @@
Audio::AudioStream *stream = Audio::makeLoopingAudioStream(
Audio::makeRawStream(buffer._data, buffer._length, buffer._frequency, flags, DisposeAfterUse::NO),
loop ? 0 : 1);
- _mixer->playInputStream(soundType, handle, stream, -1, volume);
+ _mixer->playStream(soundType, handle, stream, -1, volume);
}
void Sound::playSound(const SoundSample *buffer, int volume, bool loop) {
Modified: scummvm/trunk/engines/drascula/sound.cpp
===================================================================
--- scummvm/trunk/engines/drascula/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/drascula/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -188,7 +188,7 @@
Audio::AudioStream *sound = Audio::makeRawStream(soundData, soundSize - 64,
11025, Audio::FLAG_UNSIGNED);
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_soundHandle, sound);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_soundHandle, sound);
} else
warning("playFile: Could not open %s", fname);
}
Modified: scummvm/trunk/engines/gob/sound/adlib.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/adlib.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/gob/sound/adlib.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -74,7 +74,7 @@
_pollNotes[i] = 0;
setFreqs();
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_handle,
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_handle,
this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Modified: scummvm/trunk/engines/gob/sound/infogrames.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/infogrames.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/gob/sound/infogrames.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -66,7 +66,7 @@
void Infogrames::play() {
if (_song && !_mixer->isSoundHandleActive(_handle)) {
_song->restart();
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType,
+ _mixer->playStream(Audio::Mixer::kMusicSoundType,
&_handle, _song, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
}
}
Modified: scummvm/trunk/engines/gob/sound/pcspeaker.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/pcspeaker.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/gob/sound/pcspeaker.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -30,7 +30,7 @@
PCSpeaker::PCSpeaker(Audio::Mixer &mixer) : _mixer(&mixer) {
_stream = new Audio::PCSpeaker(_mixer->getOutputRate());
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType,
+ _mixer->playStream(Audio::Mixer::kSFXSoundType,
&_handle, _stream, -1, 50, 0, DisposeAfterUse::NO, true);
}
Modified: scummvm/trunk/engines/gob/sound/protracker.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/protracker.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/gob/sound/protracker.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -52,7 +52,7 @@
if (!_protrackerStream)
return false;
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_handle,
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_handle,
_protrackerStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
return true;
Modified: scummvm/trunk/engines/gob/sound/soundmixer.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/gob/sound/soundmixer.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -53,7 +53,7 @@
_fadeSamples = 0;
_curFadeSamples = 0;
- _mixer->playInputStream(type, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(type, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
SoundMixer::~SoundMixer() {
Modified: scummvm/trunk/engines/groovie/roq.cpp
===================================================================
--- scummvm/trunk/engines/groovie/roq.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/groovie/roq.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -519,7 +519,7 @@
if (!_audioStream) {
_audioStream = Audio::makeQueuingAudioStream(22050, false);
Audio::SoundHandle sound_handle;
- g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
+ g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
}
// Create the audio buffer
@@ -562,7 +562,7 @@
if (!_audioStream) {
_audioStream = Audio::makeQueuingAudioStream(22050, true);
Audio::SoundHandle sound_handle;
- g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
+ g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
}
// Create the audio buffer
Modified: scummvm/trunk/engines/groovie/vdx.cpp
===================================================================
--- scummvm/trunk/engines/groovie/vdx.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/groovie/vdx.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -501,7 +501,7 @@
if (!_audioStream) {
_audioStream = Audio::makeQueuingAudioStream(22050, false);
Audio::SoundHandle sound_handle;
- g_system->getMixer()->playInputStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
+ g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType, &sound_handle, _audioStream);
}
byte *data = (byte *)malloc(60000);
Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/kyra/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -118,7 +118,7 @@
if (h >= kNumChannelHandles)
return false;
- _mixer->playInputStream(isSfx ? Audio::Mixer::kSFXSoundType : Audio::Mixer::kSpeechSoundType, &_soundChannels[h], stream, -1, volume);
+ _mixer->playStream(isSfx ? Audio::Mixer::kSFXSoundType : Audio::Mixer::kSpeechSoundType, &_soundChannels[h], stream, -1, volume);
if (handle)
*handle = _soundChannels[h];
Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -451,7 +451,7 @@
// is used by SFX or music, and then adjust the volume accordingly. Since Kyrandia 2 supports
// different volumes for SFX and music, looking at the disasm and checking how the original does it
// would be a good idea.
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
_samplesPerCallback = getRate() / CALLBACKS_PER_SECOND;
_samplesPerCallbackRemainder = getRate() % CALLBACKS_PER_SECOND;
Modified: scummvm/trunk/engines/kyra/sound_amiga.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_amiga.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/kyra/sound_amiga.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -154,7 +154,7 @@
_driver->setVolume(volume);
_driver->setTempo(tempo << 4);
if (!_mixer->isSoundHandleActive(_musicHandle))
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
}
} else if (track == 0)
_driver->stopMusic();
@@ -215,7 +215,7 @@
if (_sfxEnabled && sfx) {
const bool success = _driver->playNote(sfx->note, sfx->patch, sfx->duration, sfx->volume, pan);
if (success && !_mixer->isSoundHandleActive(_musicHandle))
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
}
}
Modified: scummvm/trunk/engines/kyra/sound_digital.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_digital.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/kyra/sound_digital.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -482,7 +482,7 @@
if (type == Audio::Mixer::kSpeechSoundType && _vm->heliumMode())
use->stream->setRate(32765);
- _mixer->playInputStream(type, &use->handle, makeLoopingAudioStream(use->stream, loop ? 0 : 1), -1, volume);
+ _mixer->playStream(type, &use->handle, makeLoopingAudioStream(use->stream, loop ? 0 : 1), -1, volume);
return use - _sounds;
}
Modified: scummvm/trunk/engines/kyra/sound_pcspk.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_pcspk.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/kyra/sound_pcspk.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -41,7 +41,7 @@
_speaker = new Audio::PCSpeaker(_rate);
assert(_speaker);
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
_countdown = 0xFFFF;
_hardwareChannel[0] = 0xFF;
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -624,7 +624,7 @@
return MERR_ALREADY_OPEN;
MidiDriver_Emulated::open();
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle,
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle,
this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
return 0;
@@ -2977,7 +2977,7 @@
_prc->init(_percussionData);
}
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType,
+ _mixer->playStream(Audio::Mixer::kMusicSoundType,
&_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
_ready = true;
@@ -3927,7 +3927,7 @@
_currentSFX = Audio::makeRawStream(sfxPlaybackBuffer, playbackBufferSize,
outputRate, Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _currentSFX);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _currentSFX);
}
void SoundTowns::beginFadeOut() {
@@ -4299,7 +4299,7 @@
_currentSFX = Audio::makeRawStream(sfx, outsize, outputRate,
Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_soundChannels[h], _currentSFX);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundChannels[h], _currentSFX);
if (handle)
*handle = _soundChannels[h];
Modified: scummvm/trunk/engines/kyra/vqa.cpp
===================================================================
--- scummvm/trunk/engines/kyra/vqa.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/kyra/vqa.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -649,7 +649,7 @@
}
}
- _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sound, _stream);
+ _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_sound, _stream);
Common::EventManager *eventMan = _vm->getEventManager();
for (uint i = 0; i < _header.numFrames; i++) {
Modified: scummvm/trunk/engines/m4/sound.cpp
===================================================================
--- scummvm/trunk/engines/m4/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/m4/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -96,7 +96,7 @@
Audio::AudioStream *stream = Audio::makeLoopingAudioStream(
Audio::makeRawStream(buffer, bufferSize, 11025, Audio::FLAG_UNSIGNED),
loop ? 0 : 1);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume);
}
void Sound::playSound(int soundNum) {
@@ -151,7 +151,7 @@
// Voice format is 8bit mono, unsigned, 11025kHz
Audio::AudioStream *stream = Audio::makeRawStream(buffer, soundStream->size(), 11025, Audio::FLAG_UNSIGNED);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume);
}
void Sound::pauseVoice() {
@@ -267,7 +267,7 @@
_dsrFile.dsrEntries[soundIndex]->uncompSize,
_dsrFile.dsrEntries[soundIndex]->frequency, Audio::FLAG_UNSIGNED),
loop ? 0 : 1);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume);
/*
// Dump the sound file
Modified: scummvm/trunk/engines/made/pmvplayer.cpp
===================================================================
--- scummvm/trunk/engines/made/pmvplayer.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/made/pmvplayer.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -175,7 +175,7 @@
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;
Modified: scummvm/trunk/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/made/scriptfuncs.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -239,7 +239,7 @@
}
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 @@
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;
Modified: scummvm/trunk/engines/mohawk/sound.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/mohawk/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -140,7 +140,7 @@
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 @@
// 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) {
Modified: scummvm/trunk/engines/mohawk/video/qt_player.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video/qt_player.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/mohawk/video/qt_player.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -191,7 +191,7 @@
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() {
Modified: scummvm/trunk/engines/parallaction/sound_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_br.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/parallaction/sound_br.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -432,7 +432,7 @@
Channel *ch = &_channels[channel];
Audio::AudioStream *input = loadChannelData(filename, ch, looping);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &ch->handle, input, -1, volume);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &ch->handle, input, -1, volume);
}
void DosSoundMan_br::playMusic() {
@@ -509,7 +509,7 @@
volume = ch->volume;
}
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &ch->handle, input, -1, volume);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &ch->handle, input, -1, volume);
}
void AmigaSoundMan_br::playMusic() {
@@ -531,7 +531,7 @@
debugC(3, kDebugAudio, "AmigaSoundMan_ns::playMusic(): created new music stream");
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _musicStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, false);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _musicStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, false);
}
void AmigaSoundMan_br::stopMusic() {
Modified: scummvm/trunk/engines/parallaction/sound_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_ns.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/parallaction/sound_ns.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -406,7 +406,7 @@
volume = ch->volume;
}
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &ch->handle, input, -1, volume);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &ch->handle, input, -1, volume);
}
void AmigaSoundMan_ns::stopSfx(uint channel) {
@@ -431,7 +431,7 @@
debugC(3, kDebugAudio, "AmigaSoundMan_ns::playMusic(): created new music stream");
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _musicStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, false);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _musicStream, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, false);
}
void AmigaSoundMan_ns::stopMusic() {
Modified: scummvm/trunk/engines/queen/midiadlib.cpp
===================================================================
--- scummvm/trunk/engines/queen/midiadlib.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/queen/midiadlib.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -132,7 +132,7 @@
adlibSetNoteVolume(i, 0);
adlibTurnNoteOff(i);
}
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
return 0;
}
Modified: scummvm/trunk/engines/queen/sound.cpp
===================================================================
--- scummvm/trunk/engines/queen/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/queen/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -121,7 +121,7 @@
void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
Common::MemoryReadStream *tmp = f->readStream(size);
assert(tmp);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeMP3Stream(tmp, DisposeAfterUse::YES)));
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeMP3Stream(tmp, DisposeAfterUse::YES)));
}
};
#endif
@@ -134,7 +134,7 @@
void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
Common::MemoryReadStream *tmp = f->readStream(size);
assert(tmp);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeVorbisStream(tmp, DisposeAfterUse::YES)));
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeVorbisStream(tmp, DisposeAfterUse::YES)));
}
};
#endif
@@ -147,7 +147,7 @@
void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
Common::MemoryReadStream *tmp = f->readStream(size);
assert(tmp);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeFLACStream(tmp, DisposeAfterUse::YES)));
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeFLACStream(tmp, DisposeAfterUse::YES)));
}
};
#endif // #ifdef USE_FLAC
@@ -331,7 +331,7 @@
Audio::Mixer::SoundType type = (soundHandle == &_speechHandle) ? Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType;
Audio::AudioStream *stream = Audio::makeRawStream(sound, size, 11840, Audio::FLAG_UNSIGNED);
- _mixer->playInputStream(type, soundHandle, stream);
+ _mixer->playStream(type, soundHandle, stream);
}
}
@@ -615,7 +615,7 @@
f->read(soundData, soundSize);
Audio::AudioStream *stream = Audio::makeRawStream(soundData, soundSize, 11025, 0);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream);
}
}
}
@@ -648,7 +648,7 @@
_mixer->stopHandle(_modHandle);
Audio::AudioStream *stream = loadModule(base, song);
if (stream) {
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_modHandle, stream);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_modHandle, stream);
}
_fanfareCount = 0;
}
@@ -657,7 +657,7 @@
_mixer->stopHandle(_patHandle);
Audio::AudioStream *stream = loadModule(base, -pattern);
if (stream) {
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_patHandle, stream);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_patHandle, stream);
}
}
Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/saga/music.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -280,7 +280,7 @@
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 @@
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;
Modified: scummvm/trunk/engines/saga/sound.cpp
===================================================================
--- scummvm/trunk/engines/saga/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/saga/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -102,7 +102,7 @@
}
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) {
Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sci/sound/audio.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -61,7 +61,7 @@
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;
}
Modified: scummvm/trunk/engines/sci/sound/drivers/adlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/adlib.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sci/sound/drivers/adlib.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -238,7 +238,7 @@
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;
}
Modified: scummvm/trunk/engines/sci/sound/drivers/amiga.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/amiga.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sci/sound/drivers/amiga.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -541,7 +541,7 @@
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;
}
Modified: scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sci/sound/drivers/pcjr.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -221,7 +221,7 @@
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;
}
Modified: scummvm/trunk/engines/sci/sound/iterator/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/iterator/core.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sci/sound/iterator/core.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -639,7 +639,7 @@
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;
}
}
Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sci/sound/music.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -256,11 +256,11 @@
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);
}
Modified: scummvm/trunk/engines/scumm/he/cup_player_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/cup_player_he.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/he/cup_player_he.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -169,7 +169,7 @@
uint8 *soundData = _sfxBuffer + offset;
if (READ_BE_UINT32(soundData) == MKID_BE('DATA')) {
uint32 soundSize = READ_BE_UINT32(soundData + 4);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle,
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle,
Audio::makeLoopingAudioStream(
Audio::makeRawStream(soundData + 8, soundSize - 8,
11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO),
Modified: scummvm/trunk/engines/scumm/he/sound_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/sound_he.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/he/sound_he.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -575,7 +575,7 @@
if (_vm->_game.heversion == 70) {
stream = Audio::makeRawStream(spoolPtr, size, 11025, flags, DisposeAfterUse::NO);
- _mixer->playInputStream(type, &_heSoundChannels[heChannel], stream, soundID);
+ _mixer->playStream(type, &_heSoundChannels[heChannel], stream, soundID);
return;
}
}
@@ -671,7 +671,7 @@
} else {
stream = Audio::makeRawStream(ptr + memStream.pos() + heOffset, size - heOffset, rate, flags, DisposeAfterUse::NO);
}
- _mixer->playInputStream(type, &_heSoundChannels[heChannel],
+ _mixer->playStream(type, &_heSoundChannels[heChannel],
Audio::makeLoopingAudioStream(stream, (heFlags & 1) ? 0 : 1), soundID);
}
// Support for sound in Humongous Entertainment games
@@ -730,7 +730,7 @@
_mixer->stopHandle(_heSoundChannels[heChannel]);
stream = Audio::makeRawStream(ptr + heOffset + 8, size, rate, flags, DisposeAfterUse::NO);
- _mixer->playInputStream(type, &_heSoundChannels[heChannel],
+ _mixer->playStream(type, &_heSoundChannels[heChannel],
Audio::makeLoopingAudioStream(stream, (heFlags & 1) ? 0 : 1), soundID);
}
// Support for PCM music in 3DO versions of Humongous Entertainment games
@@ -751,7 +751,7 @@
_currentMusic = soundID;
stream = Audio::makeRawStream(sound, size, rate, 0);
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, NULL, stream, soundID);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, NULL, stream, soundID);
}
else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) {
if (_vm->_imuse) {
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -202,7 +202,7 @@
track->stream = Audio::makeQueuingAudioStream(freq, (track->mixerFlags & kFlagStereo) != 0);
- _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(),
+ _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(),
DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0);
_mixer->pauseHandle(track->mixChanHandle, true);
}
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -112,7 +112,7 @@
track->souStreamUsed = (input != 0);
if (track->souStreamUsed) {
- _mixer->playInputStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan(),
+ _mixer->playStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan(),
DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0);
} else {
strcpy(track->soundName, soundName);
@@ -169,7 +169,7 @@
}
track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo);
- _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(),
+ _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(),
DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0);
}
@@ -370,7 +370,7 @@
// Create an appendable output buffer
fadeTrack->stream = Audio::makeQueuingAudioStream(_sound->getFreq(fadeTrack->soundDesc), track->mixerFlags & kFlagStereo);
- _mixer->playInputStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan(),
+ _mixer->playStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan(),
DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0);
fadeTrack->used = true;
Modified: scummvm/trunk/engines/scumm/player_mod.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_mod.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/player_mod.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -49,7 +49,7 @@
_playproc = NULL;
_playparam = NULL;
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Player_MOD::~Player_MOD() {
Modified: scummvm/trunk/engines/scumm/player_nes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_nes.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/player_nes.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -621,7 +621,7 @@
APU_writeControl(0);
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Player_NES::~Player_NES() {
Modified: scummvm/trunk/engines/scumm/player_pce.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_pce.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/player_pce.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -726,7 +726,7 @@
_psg = new PSG_HuC6280(PSG_CLOCK, _sampleRate);
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Player_PCE::~Player_PCE() {
Modified: scummvm/trunk/engines/scumm/player_sid.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_sid.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/player_sid.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -1263,7 +1263,7 @@
initSID();
resetSID();
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Player_SID::~Player_SID() {
Modified: scummvm/trunk/engines/scumm/player_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/player_v2.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -366,7 +366,7 @@
set_pcjr(pcjr);
setMusicVolume(255);
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Player_V2::~Player_V2() {
Modified: scummvm/trunk/engines/scumm/player_v2cms.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2cms.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/player_v2cms.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -891,7 +891,7 @@
}
}
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Player_V2CMS::~Player_V2CMS() {
Modified: scummvm/trunk/engines/scumm/player_v4a.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v4a.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/player_v4a.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -154,7 +154,7 @@
// the Tfmx-player never "ends" the output by itself, so this should be threadsafe
if (!_mixer->isSoundHandleActive(_sfxHandle))
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, &_tfmxSfx, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, &_tfmxSfx, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
} else { // Song
debug(3, "player_v4a: play %d: song %i - %02X", nr, index, type);
@@ -166,7 +166,7 @@
// the Tfmx-player never "ends" the output by itself, so this should be threadsafe
if (!_mixer->isSoundHandleActive(_musicHandle))
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, &_tfmxMusic, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, &_tfmxMusic, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
_musicId = nr;
}
}
Modified: scummvm/trunk/engines/scumm/smush/smush_mixer.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_mixer.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/smush/smush_mixer.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -124,7 +124,7 @@
// Stream the data
if (!_channels[i].stream) {
_channels[i].stream = Audio::makeQueuingAudioStream(_channels[i].chan->getRate(), stereo);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_channels[i].handle, _channels[i].stream);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_channels[i].handle, _channels[i].stream);
}
_mixer->setChannelVolume(_channels[i].handle, vol);
_mixer->setChannelBalance(_channels[i].handle, pan);
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -471,7 +471,7 @@
if (!_IACTstream) {
_IACTstream = Audio::makeQueuingAudioStream(22050, true);
- _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_IACTchannel, _IACTstream);
+ _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_IACTchannel, _IACTstream);
}
_IACTstream->queueBuffer(output_data, 0x1000, DisposeAfterUse::YES, Audio::FLAG_STEREO | Audio::FLAG_16BITS);
@@ -1111,7 +1111,7 @@
strcpy(fname + (i - filename), ".ogg");
if (file->open(fname)) {
_compressedFileMode = true;
- _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeVorbisStream(file, DisposeAfterUse::YES));
+ _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeVorbisStream(file, DisposeAfterUse::YES));
return;
}
#endif
@@ -1120,7 +1120,7 @@
strcpy(fname + (i - filename), ".mp3");
if (file->open(fname)) {
_compressedFileMode = true;
- _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeMP3Stream(file, DisposeAfterUse::YES));
+ _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_compressedFileSoundHandle, Audio::makeMP3Stream(file, DisposeAfterUse::YES));
return;
}
#endif
Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/scumm/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -204,7 +204,7 @@
memcpy(sound, ptr, size);
stream = Audio::makeRawStream(sound, size, rate, Audio::FLAG_UNSIGNED);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
}
// WORKAROUND bug # 1311447
else if (READ_BE_UINT32(ptr) == 0x460e200d) {
@@ -227,7 +227,7 @@
sound = (byte *)malloc(size);
memcpy(sound, ptr, size);
stream = Audio::makeRawStream(sound, size, rate, Audio::FLAG_UNSIGNED);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
}
// Support for sampled sound effects in Monkey Island 1 and 2
else if (READ_BE_UINT32(ptr) == MKID_BE('SBL ')) {
@@ -299,7 +299,7 @@
sound = (byte *)malloc(size);
memcpy(sound, ptr + 6, size);
stream = Audio::makeRawStream(sound, size, rate, Audio::FLAG_UNSIGNED);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
}
else if ((_vm->_game.platform == Common::kPlatformFMTowns && _vm->_game.version == 3) || READ_BE_UINT32(ptr) == MKID_BE('SOUN') || READ_BE_UINT32(ptr) == MKID_BE('TOWS')) {
@@ -355,7 +355,7 @@
} else {
stream = Audio::makeRawStream(sound, waveSize, rate, Audio::FLAG_UNSIGNED);
}
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0);
}
break;
case 1:
@@ -450,7 +450,7 @@
stream = plainStream;
}
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, vol, 0);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, vol, 0);
}
else {
@@ -677,7 +677,7 @@
_vm->_imuseDigital->startVoice(kTalkSoundID, input);
#endif
} else {
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, handle, input, id);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, handle, input, id);
}
}
}
Modified: scummvm/trunk/engines/sky/intro.cpp
===================================================================
--- scummvm/trunk/engines/sky/intro.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sky/intro.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -735,12 +735,12 @@
return false;
vData = _skyDisk->loadFile(*data++);
// HACK: Fill the header with silence. We should
- // probably use _skySound instead of calling playInputStream()
+ // probably use _skySound instead of calling playStream()
// directly, but this will have to do for now.
memset(vData, 127, sizeof(DataFileHeader));
stream = Audio::makeRawStream(vData, _skyDisk->_lastLoadedFileSize, 11025, Audio::FLAG_UNSIGNED);
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_voice, stream, SOUND_VOICE);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_voice, stream, SOUND_VOICE);
return true;
case WAITVOICE:
while (_mixer->isSoundHandleActive(_voice))
@@ -756,12 +756,12 @@
case LOOPBG:
_mixer->stopID(SOUND_BG);
stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, Audio::makeLoopingAudioStream(stream, 0), SOUND_BG);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_bgSfx, Audio::makeLoopingAudioStream(stream, 0), SOUND_BG);
return true;
case PLAYBG:
_mixer->stopID(SOUND_BG);
stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, stream, SOUND_BG);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_bgSfx, stream, SOUND_BG);
return true;
case STOPBG:
_mixer->stopID(SOUND_BG);
Modified: scummvm/trunk/engines/sky/music/adlibmusic.cpp
===================================================================
--- scummvm/trunk/engines/sky/music/adlibmusic.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sky/music/adlibmusic.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -40,7 +40,7 @@
_opl = makeAdLibOPL(_sampleRate);
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
AdLibMusic::~AdLibMusic() {
Modified: scummvm/trunk/engines/sky/sound.cpp
===================================================================
--- scummvm/trunk/engines/sky/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sky/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -1046,7 +1046,7 @@
_mixer->stopID(id);
Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, 11025, flags);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, stream, id);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, handle, stream, id);
}
void Sound::loadSection(uint8 pSection) {
@@ -1126,9 +1126,9 @@
}
if (channel == 0)
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_ingameSound0, output, SOUND_CH0, volume, 0);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_ingameSound0, output, SOUND_CH0, volume, 0);
else
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_ingameSound1, output, SOUND_CH1, volume, 0);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_ingameSound1, output, SOUND_CH1, volume, 0);
}
void Sound::fnStartFx(uint32 sound, uint8 channel) {
@@ -1252,7 +1252,7 @@
_mixer->stopID(SOUND_SPEECH);
Audio::AudioStream *stream = Audio::makeRawStream(playBuffer, speechSize, rate, Audio::FLAG_UNSIGNED);
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_ingameSpeech, stream, SOUND_SPEECH);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_ingameSpeech, stream, SOUND_SPEECH);
return true;
}
Modified: scummvm/trunk/engines/sword1/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword1/animation.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sword1/animation.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -147,7 +147,7 @@
void MoviePlayer::play() {
if (_bgSoundStream) {
- _snd->playInputStream(Audio::Mixer::kSFXSoundType, _bgSoundHandle, _bgSoundStream);
+ _snd->playStream(Audio::Mixer::kSFXSoundType, _bgSoundHandle, _bgSoundStream);
}
bool terminated = false;
Modified: scummvm/trunk/engines/sword1/music.cpp
===================================================================
--- scummvm/trunk/engines/sword1/music.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sword1/music.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -238,7 +238,7 @@
_converter[0] = NULL;
_converter[1] = NULL;
_volumeL = _volumeR = 192;
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Music::~Music() {
Modified: scummvm/trunk/engines/sword1/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sword1/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -261,7 +261,7 @@
if (SwordEngine::isPsx()) {
uint32 size = READ_LE_UINT32(sampleData);
Audio::AudioStream *audStream = Audio::makeLoopingAudioStream(Audio::makeVagStream(new Common::MemoryReadStream(sampleData + 4, size-4)), (_fxList[elem->id].type == FX_LOOP) ? 0 : 1);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &elem->handle, audStream, elem->id, volume, pan);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &elem->handle, audStream, elem->id, volume, pan);
} else {
uint32 size = READ_LE_UINT32(sampleData + 0x28);
uint8 flags;
@@ -274,7 +274,7 @@
Audio::AudioStream *stream = Audio::makeLoopingAudioStream(
Audio::makeRawStream(sampleData + 0x2C, size, 11025, flags, DisposeAfterUse::NO),
(_fxList[elem->id].type == FX_LOOP) ? 0 : 1);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &elem->handle, stream, elem->id, volume, pan);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &elem->handle, stream, elem->id, volume, pan);
}
}
} else
@@ -362,14 +362,14 @@
int16 *data = uncompressSpeech(index + _cowHeaderSize, sampleSize, &size);
if (data) {
stream = Audio::makeRawStream((byte *)data, size, 11025, SPEECH_FLAGS);
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
}
} else if (_cowMode == CowPSX && sampleSize != 0xffffffff) {
_cowFile.seek(index * 2048);
Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
assert(tmp);
stream = Audio::makeVagStream(tmp);
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
// with compressed audio, we can't calculate the wave volume.
// so default to talking.
for (int cnt = 0; cnt < 480; cnt++)
@@ -382,7 +382,7 @@
Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
assert(tmp);
stream = Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
// with compressed audio, we can't calculate the wave volume.
// so default to talking.
for (int cnt = 0; cnt < 480; cnt++)
@@ -396,7 +396,7 @@
Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
assert(tmp);
stream = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
// with compressed audio, we can't calculate the wave volume.
// so default to talking.
for (int cnt = 0; cnt < 480; cnt++)
@@ -410,7 +410,7 @@
Common::MemoryReadStream *tmp = _cowFile.readStream(sampleSize);
assert(tmp);
stream = Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
// with compressed audio, we can't calculate the wave volume.
// so default to talking.
for (int cnt = 0; cnt < 480; cnt++)
Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sword2/animation.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -102,7 +102,7 @@
}
if (_bgSoundStream) {
- _snd->playInputStream(Audio::Mixer::kSFXSoundType, _bgSoundHandle, _bgSoundStream);
+ _snd->playStream(Audio::Mixer::kSFXSoundType, _bgSoundHandle, _bgSoundStream);
}
bool terminated = false;
Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sword2/music.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -799,7 +799,7 @@
p = -p;
// Start the speech playing
- _vm->_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_soundHandleSpeech, input, -1, volume, p);
+ _vm->_mixer->playStream(Audio::Mixer::kSpeechSoundType, &_soundHandleSpeech, input, -1, volume, p);
return RD_OK;
}
Modified: scummvm/trunk/engines/sword2/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/sword2/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -93,7 +93,7 @@
_mixBuffer = NULL;
_mixBufferLen = 0;
- _vm->_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _vm->_mixer->playStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Sound::~Sound() {
@@ -343,7 +343,7 @@
assert(input);
- _vm->_mixer->playInputStream(soundType, handle,
+ _vm->_mixer->playStream(soundType, handle,
Audio::makeLoopingAudioStream(input, loop ? 0 : 1),
-1, vol, pan, DisposeAfterUse::YES, false, isReverseStereo());
Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -433,7 +433,7 @@
syncSoundSettings();
music->load(1);
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, music, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, false);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, music, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, false);
music->start();
int load_slot = Common::ConfigManager::instance().getInt("save_slot");
@@ -925,7 +925,7 @@
//debug(0, "playing %u samples...", size);
Audio::AudioStream *stream = Audio::makeRawStream(data, size, 11025, 0);
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_soundHandle, stream); //dispose is YES by default
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle, stream); //dispose is YES by default
}
Modified: scummvm/trunk/engines/tinsel/bmv.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/bmv.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/tinsel/bmv.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -459,7 +459,7 @@
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;
}
Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/tinsel/music.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -570,7 +570,7 @@
_end = true;
- _vm->_mixer->playInputStream(Audio::Mixer::kMusicSoundType,
+ _vm->_mixer->playStream(Audio::Mixer::kMusicSoundType,
&_handle, this, -1, _volume, 0, DisposeAfterUse::NO, true);
}
Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/tinsel/sound.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -117,7 +117,7 @@
_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 @@
break;
}
if (sampleStream) {
- _vm->_mixer->playInputStream(type, &curChan.handle, sampleStream);
+ _vm->_mixer->playStream(type, &curChan.handle, sampleStream);
}
}
@@ -324,7 +324,7 @@
//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));
Modified: scummvm/trunk/engines/touche/resource.cpp
===================================================================
--- scummvm/trunk/engines/touche/resource.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/touche/resource.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -590,7 +590,7 @@
_fData.seek(offs);
Audio::AudioStream *stream = Audio::makeVOCStream(&_fData, Audio::FLAG_UNSIGNED);
if (stream) {
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream);
}
}
}
@@ -672,7 +672,7 @@
}
if (stream) {
_speechPlaying = true;
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream);
+ _mixer->playStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream);
}
}
}
Modified: scummvm/trunk/engines/tucker/resource.cpp
===================================================================
--- scummvm/trunk/engines/tucker/resource.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/tucker/resource.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -954,7 +954,7 @@
if (stream) {
_mixer->stopHandle(*handle);
- _mixer->playInputStream(type, handle, Audio::makeLoopingAudioStream(stream, loop ? 0 : 1),
+ _mixer->playStream(type, handle, Audio::makeLoopingAudioStream(stream, loop ? 0 : 1),
-1, scaleMixerVolume(volume, kMaxSoundVolume));
}
}
Modified: scummvm/trunk/engines/tucker/sequences.cpp
===================================================================
--- scummvm/trunk/engines/tucker/sequences.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/engines/tucker/sequences.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -616,7 +616,7 @@
if (_soundSeqDataList[num].musicVolume != 0) {
Audio::AudioStream *s;
if ((s = loadSound(_soundSeqDataList[num].musicIndex, kAnimationSoundType8BitsRAW)) != 0) {
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, s, -1, scaleMixerVolume(_soundSeqDataList[num].musicVolume));
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, s, -1, scaleMixerVolume(_soundSeqDataList[num].musicVolume));
}
}
_soundSeqDataIndex = 0;
@@ -631,12 +631,12 @@
switch (p->opcode) {
case 0:
if ((s = loadSound(p->num, kAnimationSoundTypeWAV)) != 0) {
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_soundsHandle[p->index], s, -1, scaleMixerVolume(p->volume));
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundsHandle[p->index], s, -1, scaleMixerVolume(p->volume));
}
break;
case 1:
if ((s = loadSound(p->num, kAnimationSoundTypeWAV)) != 0) {
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_soundsHandle[p->index], Audio::makeLoopingAudioStream(s, 0),
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundsHandle[p->index], Audio::makeLoopingAudioStream(s, 0),
-1, scaleMixerVolume(p->volume));
}
break;
@@ -649,18 +649,18 @@
case 4:
_mixer->stopHandle(_musicHandle);
if ((s = loadSound(p->num, kAnimationSoundType8BitsRAW)) != 0) {
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, s, -1, scaleMixerVolume(p->volume));
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, s, -1, scaleMixerVolume(p->volume));
}
break;
case 5:
if ((s = loadSound(p->num, kAnimationSoundTypeWAV)) != 0) {
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, s, -1, scaleMixerVolume(p->volume));
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, s, -1, scaleMixerVolume(p->volume));
}
break;
case 6:
_mixer->stopHandle(_musicHandle);
if ((s = loadSound(p->num, kAnimationSoundType16BitsRAW)) != 0) {
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, s, -1, scaleMixerVolume(p->volume));
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, s, -1, scaleMixerVolume(p->volume));
}
break;
default:
Modified: scummvm/trunk/graphics/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/avi_decoder.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/graphics/video/avi_decoder.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -245,7 +245,7 @@
// Initialize the video stuff too
_audStream = createAudioStream();
if (_audStream)
- _mixer->playInputStream(_soundType, _audHandle, _audStream);
+ _mixer->playStream(_soundType, _audHandle, _audStream);
debug (0, "Frames = %d, Dimensions = %d x %d", _header.totalFrames, _header.width, _header.height);
debug (0, "Frame Rate = %d", getFrameRate());
Modified: scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -1068,7 +1068,7 @@
} while (hasNextCmd);
if (startSound && _soundEnabled) {
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_audioHandle, _audioStream);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_audioHandle, _audioStream);
_skipFrames = 0;
_soundStage = 2;
}
@@ -2033,7 +2033,7 @@
if (startSound && _soundEnabled) {
if (_hasSound && _audioStream) {
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_audioHandle, _audioStream);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_audioHandle, _audioStream);
_skipFrames = 0;
_soundStage = 2;
} else
Modified: scummvm/trunk/graphics/video/smk_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/smk_decoder.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/graphics/video/smk_decoder.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -584,7 +584,7 @@
}
if (!_audioStarted) {
- _mixer->playInputStream(_soundType, &_audioHandle, _audioStream, -1, 255);
+ _mixer->playStream(_soundType, &_audioHandle, _audioStream, -1, 255);
_audioStarted = true;
}
} else {
Modified: scummvm/trunk/sound/audiocd.cpp
===================================================================
--- scummvm/trunk/sound/audiocd.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/sound/audiocd.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -78,7 +78,7 @@
repetitions. Finally, -1 means infinitely many
*/
_emulating = true;
- _mixer->playInputStream(Mixer::kMusicSoundType, &_handle,
+ _mixer->playStream(Mixer::kMusicSoundType, &_handle,
makeLoopingAudioStream(stream, start, end, (numLoops < 1) ? numLoops + 1 : numLoops));
} else {
_emulating = false;
Modified: scummvm/trunk/sound/mixer.cpp
===================================================================
--- scummvm/trunk/sound/mixer.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/sound/mixer.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -212,7 +212,7 @@
*handle = chanHandle;
}
-void MixerImpl::playInputStream(
+void MixerImpl::playStream(
SoundType type,
SoundHandle *handle,
AudioStream *input,
Modified: scummvm/trunk/sound/mixer.h
===================================================================
--- scummvm/trunk/sound/mixer.h 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/sound/mixer.h 2010-04-12 09:14:17 UTC (rev 48637)
@@ -115,7 +115,7 @@
* not stop this particular stream
* @param reverseStereo a flag indicating whether left and right channels shall be swapped
*/
- virtual void playInputStream(
+ virtual void playStream(
SoundType type,
SoundHandle *handle,
AudioStream *input,
Modified: scummvm/trunk/sound/mixer_intern.h
===================================================================
--- scummvm/trunk/sound/mixer_intern.h 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/sound/mixer_intern.h 2010-04-12 09:14:17 UTC (rev 48637)
@@ -75,7 +75,7 @@
virtual bool isReady() const { return _mixerReady; }
- virtual void playInputStream(
+ virtual void playStream(
SoundType type,
SoundHandle *handle,
AudioStream *input,
Modified: scummvm/trunk/sound/softsynth/adlib.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/adlib.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/sound/softsynth/adlib.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -918,7 +918,7 @@
adlib_write(0xBD, 0x00);
create_lookup_table();
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
return 0;
}
Modified: scummvm/trunk/sound/softsynth/fluidsynth.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fluidsynth.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/sound/softsynth/fluidsynth.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -144,7 +144,7 @@
MidiDriver_Emulated::open();
// The MT-32 emulator uses kSFXSoundType here. I don't know why.
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kMusicSoundType, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
return 0;
}
Modified: scummvm/trunk/sound/softsynth/mt32.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/sound/softsynth/mt32.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -287,7 +287,7 @@
_initialising = false;
g_system->fillScreen(0);
g_system->updateScreen();
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kSFXSoundType, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
return 0;
}
Modified: scummvm/trunk/sound/softsynth/ym2612.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/ym2612.cpp 2010-04-12 08:54:32 UTC (rev 48636)
+++ scummvm/trunk/sound/softsynth/ym2612.cpp 2010-04-12 09:14:17 UTC (rev 48637)
@@ -587,7 +587,7 @@
MidiDriver_Emulated::open();
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+ _mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list