aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/sound.cpp4
-rw-r--r--engines/cine/sound.cpp2
-rw-r--r--engines/draci/sound.cpp2
-rw-r--r--engines/drascula/sound.cpp2
-rw-r--r--engines/kyra/sound_towns.cpp4
-rw-r--r--engines/m4/sound.cpp6
-rw-r--r--engines/made/resource.cpp2
-rw-r--r--engines/mohawk/sound.cpp4
-rw-r--r--engines/mohawk/video/qt_player.cpp2
-rw-r--r--engines/parallaction/sound_br.cpp4
-rw-r--r--engines/parallaction/sound_ns.cpp2
-rw-r--r--engines/queen/sound.cpp4
-rw-r--r--engines/saga/shorten.cpp2
-rw-r--r--engines/saga/sound.cpp2
-rw-r--r--engines/sci/sound/audio.cpp2
-rw-r--r--engines/sci/sound/iterator/iterator.cpp2
-rw-r--r--engines/sci/sound/music.cpp2
-rw-r--r--engines/scumm/he/cup_player_he.cpp2
-rw-r--r--engines/scumm/he/sound_he.cpp10
-rw-r--r--engines/scumm/sound.cpp6
-rw-r--r--engines/sky/intro.cpp6
-rw-r--r--engines/sky/sound.cpp6
-rw-r--r--engines/sword1/sound.cpp4
-rw-r--r--engines/teenagent/teenagent.cpp2
-rw-r--r--engines/tinsel/sound.cpp2
-rw-r--r--engines/tucker/sequences.cpp2
26 files changed, 44 insertions, 44 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index ee10cd6a5a..6f7aebc5b9 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -292,7 +292,7 @@ Audio::AudioStream *RawSound::makeAudioStream(uint sound) {
assert(buffer);
_file->read(buffer, size);
- return Audio::makeRawMemoryStream(buffer, size, 22050, _flags);
+ return Audio::makeRawStream(buffer, size, 22050, _flags);
}
void RawSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
@@ -737,7 +737,7 @@ void Sound::playRawData(byte *soundData, uint sound, uint size, uint freq) {
if (_vm->getPlatform() == Common::kPlatformPC)
flags = Audio::FLAG_UNSIGNED;
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(buffer, size, freq, flags);
+ Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, freq, flags);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_effectsHandle, stream);
}
diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp
index b260e7a48e..2fdc8297bf 100644
--- a/engines/cine/sound.cpp
+++ b/engines/cine/sound.cpp
@@ -845,7 +845,7 @@ void PaulaSound::update() {
void PaulaSound::playSoundChannel(int channel, int frequency, uint8 *data, int size, int volume) {
assert(frequency > 0);
frequency = PAULA_FREQ / frequency;
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(data, size, frequency, 0);
+ Audio::AudioStream *stream = Audio::makeRawStream(data, size, frequency, 0);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_channelsTable[channel], stream);
_mixer->setChannelVolume(_channelsTable[channel], volume * Audio::Mixer::kMaxChannelVolume / 63);
}
diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp
index 826b4bdfa6..12ac36b5c5 100644
--- a/engines/draci/sound.cpp
+++ b/engines/draci/sound.cpp
@@ -202,7 +202,7 @@ void Sound::playSoundBuffer(Audio::SoundHandle *handle, const SoundSample &buffe
// Don't use DisposeAfterUse::YES, because our caching system deletes samples by itself.
Audio::AudioStream *stream = Audio::makeLoopingAudioStream(
- Audio::makeRawMemoryStream(buffer._data, buffer._length, buffer._frequency, flags, DisposeAfterUse::NO),
+ Audio::makeRawStream(buffer._data, buffer._length, buffer._frequency, flags, DisposeAfterUse::NO),
loop ? 0 : 1);
_mixer->playInputStream(soundType, handle, stream, -1, volume);
}
diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp
index 811014100e..17d7b88d4c 100644
--- a/engines/drascula/sound.cpp
+++ b/engines/drascula/sound.cpp
@@ -185,7 +185,7 @@ void DrasculaEngine::playFile(const char *fname) {
if (ConfMan.getBool("speech_mute"))
memset(soundData, 0x80, soundSize); // Mute speech but keep the pause
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(soundData, soundSize - 64,
+ Audio::AudioStream *stream = Audio::makeRawStream(soundData, soundSize - 64,
11025, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_soundHandle, stream);
} else
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 1c88f8e878..aab8373c61 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -3925,7 +3925,7 @@ void SoundTowns::playSoundEffect(uint8 track) {
uint32 outputRate = uint32(11025 * calculatePhaseStep(note, sfxRootNoteOffs, sfxRate, 11025, 0x2000));
- _currentSFX = Audio::makeRawMemoryStream(sfxPlaybackBuffer, playbackBufferSize,
+ _currentSFX = Audio::makeRawStream(sfxPlaybackBuffer, playbackBufferSize,
outputRate, Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _currentSFX);
}
@@ -4297,7 +4297,7 @@ int32 SoundTownsPC98_v2::voicePlay(const char *file, Audio::SoundHandle *handle,
uint32 outputRate = uint32(11025 * SoundTowns::calculatePhaseStep(0x3c, 0x3c, sfxRate, 11025, 0x2000));
- _currentSFX = Audio::makeRawMemoryStream(sfx, outsize, outputRate,
+ _currentSFX = Audio::makeRawStream(sfx, outsize, outputRate,
Audio::FLAG_UNSIGNED | Audio::FLAG_LITTLE_ENDIAN);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_soundChannels[h], _currentSFX);
if (handle)
diff --git a/engines/m4/sound.cpp b/engines/m4/sound.cpp
index 63956259b3..37fe36cf2b 100644
--- a/engines/m4/sound.cpp
+++ b/engines/m4/sound.cpp
@@ -94,7 +94,7 @@ void Sound::playSound(const char *soundName, int volume, bool loop, int channel)
// Sound format is 8bit mono, unsigned, 11025kHz
Audio::AudioStream *stream = Audio::makeLoopingAudioStream(
- Audio::makeRawMemoryStream(buffer, bufferSize, 11025, Audio::FLAG_UNSIGNED),
+ Audio::makeRawStream(buffer, bufferSize, 11025, Audio::FLAG_UNSIGNED),
loop ? 0 : 1);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume);
}
@@ -146,7 +146,7 @@ void Sound::playVoice(const char *soundName, int volume) {
_vm->res()->toss(soundName);
// Voice format is 8bit mono, unsigned, 11025kHz
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(buffer, soundStream->size(), 11025, Audio::FLAG_UNSIGNED);
+ Audio::AudioStream *stream = Audio::makeRawStream(buffer, soundStream->size(), 11025, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &handle->handle, stream, -1, volume);
}
@@ -259,7 +259,7 @@ void Sound::playDSRSound(int soundIndex, int volume, bool loop) {
// Play sound
Audio::AudioStream *stream = Audio::makeLoopingAudioStream(
- Audio::makeRawMemoryStream(buffer,
+ Audio::makeRawStream(buffer,
_dsrFile.dsrEntries[soundIndex]->uncompSize,
_dsrFile.dsrEntries[soundIndex]->frequency, Audio::FLAG_UNSIGNED),
loop ? 0 : 1);
diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp
index 39e9ae859c..28d46cf4ec 100644
--- a/engines/made/resource.cpp
+++ b/engines/made/resource.cpp
@@ -262,7 +262,7 @@ void SoundResource::load(byte *source, int size) {
Audio::AudioStream *SoundResource::getAudioStream(int soundRate, bool loop) {
Audio::RewindableAudioStream *stream =
- Audio::makeRawMemoryStream(_soundData, _soundSize, soundRate, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO);
+ Audio::makeRawStream(_soundData, _soundSize, soundRate, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO);
if (loop)
return Audio::makeLoopingAudioStream(stream, 0);
diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index 5a183d6117..177ba18b3b 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -461,7 +461,7 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre
if (data_chunk.channels == 2)
flags |= Audio::FLAG_STEREO;
- return Audio::makeRawMemoryStream(data_chunk.audio_data, data_chunk.size, data_chunk.sample_rate, flags);
+ return Audio::makeRawStream(data_chunk.audio_data, data_chunk.size, data_chunk.sample_rate, flags);
} else if (data_chunk.encoding == kCodecADPCM) {
Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES);
uint32 blockAlign = data_chunk.channels * data_chunk.bitsPerSample / 8;
@@ -501,7 +501,7 @@ Audio::AudioStream *Sound::makeOldMohawkWaveStream(Common::SeekableReadStream *s
stream->read(data, size);
delete stream;
- return Audio::makeRawMemoryStream(data, size, rate, Audio::FLAG_UNSIGNED);
+ return Audio::makeRawStream(data, size, rate, Audio::FLAG_UNSIGNED);
}
SndHandle *Sound::getHandle() {
diff --git a/engines/mohawk/video/qt_player.cpp b/engines/mohawk/video/qt_player.cpp
index 85c9e5f658..104e35db8c 100644
--- a/engines/mohawk/video/qt_player.cpp
+++ b/engines/mohawk/video/qt_player.cpp
@@ -1170,7 +1170,7 @@ Audio::AudioStream *QTPlayer::createAudioStream(Common::SeekableReadStream *stre
byte *data = (byte *)malloc(dataSize);
stream->read(data, dataSize);
delete stream;
- return Audio::makeRawMemoryStream(data, dataSize, _streams[_audioStreamIndex]->sample_rate, flags);
+ return Audio::makeRawStream(data, dataSize, _streams[_audioStreamIndex]->sample_rate, flags);
} else if (_streams[_audioStreamIndex]->codec_tag == MKID_BE('ima4')) {
// Riven uses this codec (as do some Myst ME videos)
return Audio::makeADPCMStream(stream, true, stream->size(), Audio::kADPCMApple, _streams[_audioStreamIndex]->sample_rate, _streams[_audioStreamIndex]->channels, 34);
diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp
index 75629b268a..ea66a7e299 100644
--- a/engines/parallaction/sound_br.cpp
+++ b/engines/parallaction/sound_br.cpp
@@ -416,7 +416,7 @@ Audio::AudioStream *DosSoundMan_br::loadChannelData(const char *filename, Channe
int rate = 11025;
ch->stream = Audio::makeLoopingAudioStream(
- Audio::makeRawMemoryStream(data, dataSize, rate, Audio::FLAG_UNSIGNED),
+ Audio::makeRawStream(data, dataSize, rate, Audio::FLAG_UNSIGNED),
looping ? 0 : 1);
return ch->stream;
}
@@ -477,7 +477,7 @@ Audio::AudioStream *AmigaSoundMan_br::loadChannelData(const char *filename, Chan
// TODO: Confirm sound rate
int rate = 11025;
- input = Audio::makeRawMemoryStream((byte *)data, dataSize, rate, 0);
+ input = Audio::makeRawStream((byte *)data, dataSize, rate, 0);
} else {
input = Audio::make8SVXStream(*stream, looping);
}
diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp
index fabb4a8d07..cd5fd274ed 100644
--- a/engines/parallaction/sound_ns.cpp
+++ b/engines/parallaction/sound_ns.cpp
@@ -377,7 +377,7 @@ Audio::AudioStream *AmigaSoundMan_ns::loadChannelData(const char *filename, Chan
if (!scumm_stricmp("beep", filename)) {
int rate = 11934;
ch->volume = 160;
- input = Audio::makeRawMemoryStream((byte *)beepSoundBuffer, beepSoundBufferSize, rate, 0, DisposeAfterUse::NO);
+ input = Audio::makeRawStream((byte *)beepSoundBuffer, beepSoundBufferSize, rate, 0, DisposeAfterUse::NO);
} else {
Common::SeekableReadStream *stream = _vm->_disk->loadSound(filename);
input = Audio::make8SVXStream(*stream, looping);
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index 0a49dab0b2..0711f74f8e 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -330,7 +330,7 @@ void SBSound::playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *so
f->read(sound, size);
Audio::Mixer::SoundType type = (soundHandle == &_speechHandle) ? Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType;
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(sound, size, 11840, Audio::FLAG_UNSIGNED);
+ Audio::AudioStream *stream = Audio::makeRawStream(sound, size, 11840, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(type, soundHandle, stream);
}
}
@@ -614,7 +614,7 @@ void AmigaSound::playSound(const char *base) {
if (soundData) {
f->read(soundData, soundSize);
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(soundData, soundSize, 11025, 0);
+ Audio::AudioStream *stream = Audio::makeRawStream(soundData, soundSize, 11025, 0);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream);
}
}
diff --git a/engines/saga/shorten.cpp b/engines/saga/shorten.cpp
index 17f52fe924..2137423a5a 100644
--- a/engines/saga/shorten.cpp
+++ b/engines/saga/shorten.cpp
@@ -522,7 +522,7 @@ Audio::AudioStream *makeShortenStream(Common::SeekableReadStream &stream) {
return 0;
// Since we allocated our own buffer for the data, we must specify DisposeAfterUse::YES.
- return Audio::makeRawMemoryStream(data, size, rate, flags);
+ return Audio::makeRawStream(data, size, rate, flags);
}
} // End of namespace Audio
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index f8859ad525..48c01ef947 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -73,7 +73,7 @@ void Sound::playSoundBuffer(Audio::SoundHandle *handle, const SoundBuffer &buffe
Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType;
if (!buffer.isCompressed) {
- stream = Audio::makeRawMemoryStream(buffer.buffer, buffer.size, buffer.frequency, buffer.flags);
+ stream = Audio::makeRawStream(buffer.buffer, buffer.size, buffer.frequency, buffer.flags);
} else {
Common::SeekableReadStream *memStream = new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES);
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 7d2b67a111..eecab76f5d 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -252,7 +252,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
}
if (data)
- audioStream = Audio::makeRawMemoryStream(data, size, _audioRate, flags);
+ audioStream = Audio::makeRawStream(data, size, _audioRate, flags);
if (audioStream) {
*sampleLen = (flags & Audio::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate;
diff --git a/engines/sci/sound/iterator/iterator.cpp b/engines/sci/sound/iterator/iterator.cpp
index d3de8851db..d800b80a36 100644
--- a/engines/sci/sound/iterator/iterator.cpp
+++ b/engines/sci/sound/iterator/iterator.cpp
@@ -552,7 +552,7 @@ static Audio::AudioStream *makeStream(byte *data, int size, int rate) {
// Convert stream format flags
int flags = Audio::FLAG_UNSIGNED;
- return Audio::makeRawMemoryStream(sound, size, rate, flags);
+ return Audio::makeRawStream(sound, size, rate, flags);
}
Audio::AudioStream *Sci0SongIterator::getAudioStream() {
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 912b4da5e3..7b8d5a0882 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -190,7 +190,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
if (_soundVersion >= SCI_VERSION_1_EARLY && ((SciEngine *)g_engine)->getPlatform() == Common::kPlatformAmiga)
flags = 0;
int endPart = track->digitalSampleEnd > 0 ? (track->digitalSampleSize - track->digitalSampleEnd) : 0;
- pSnd->pStreamAud = Audio::makeRawMemoryStream(channelData + track->digitalSampleStart,
+ pSnd->pStreamAud = Audio::makeRawStream(channelData + track->digitalSampleStart,
track->digitalSampleSize - track->digitalSampleStart - endPart,
track->digitalSampleRate, flags, DisposeAfterUse::NO);
delete pSnd->pLoopStream;
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index f785cf8282..17483b6bd9 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -171,7 +171,7 @@ void CUP_Player::updateSfx() {
uint32 soundSize = READ_BE_UINT32(soundData + 4);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle,
Audio::makeLoopingAudioStream(
- Audio::makeRawMemoryStream(soundData + 8, soundSize - 8,
+ Audio::makeRawStream(soundData + 8, soundSize - 8,
11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO),
(sfx->flags & kSfxFlagLoop) ? 0 : 1
)
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index cdd7e5a49b..d8924999a1 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -574,7 +574,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
musicFile.close();
if (_vm->_game.heversion == 70) {
- stream = Audio::makeRawMemoryStream(spoolPtr, size, 11025, flags, DisposeAfterUse::NO);
+ stream = Audio::makeRawStream(spoolPtr, size, 11025, flags, DisposeAfterUse::NO);
_mixer->playInputStream(type, &_heSoundChannels[heChannel], stream, soundID);
return;
}
@@ -667,9 +667,9 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
#ifdef SCUMM_LITTLE_ENDIAN
flags |= Audio::FLAG_LITTLE_ENDIAN;
#endif
- stream = Audio::makeRawMemoryStream(sound + heOffset, size - heOffset, rate, flags);
+ stream = Audio::makeRawStream(sound + heOffset, size - heOffset, rate, flags);
} else {
- stream = Audio::makeRawMemoryStream(ptr + memStream.pos() + heOffset, size - heOffset, rate, flags, DisposeAfterUse::NO);
+ stream = Audio::makeRawStream(ptr + memStream.pos() + heOffset, size - heOffset, rate, flags, DisposeAfterUse::NO);
}
_mixer->playInputStream(type, &_heSoundChannels[heChannel],
Audio::makeLoopingAudioStream(stream, (heFlags & 1) ? 0 : 1), soundID);
@@ -729,7 +729,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
_mixer->stopHandle(_heSoundChannels[heChannel]);
- stream = Audio::makeRawMemoryStream(ptr + heOffset + 8, size, rate, flags, DisposeAfterUse::NO);
+ stream = Audio::makeRawStream(ptr + heOffset + 8, size, rate, flags, DisposeAfterUse::NO);
_mixer->playInputStream(type, &_heSoundChannels[heChannel],
Audio::makeLoopingAudioStream(stream, (heFlags & 1) ? 0 : 1), soundID);
}
@@ -750,7 +750,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
_mixer->stopID(_currentMusic);
_currentMusic = soundID;
- stream = Audio::makeRawMemoryStream(sound, size, rate, 0);
+ stream = Audio::makeRawStream(sound, size, rate, 0);
_mixer->playInputStream(Audio::Mixer::kMusicSoundType, NULL, stream, soundID);
}
else if (READ_BE_UINT32(ptr) == MKID_BE('MIDI')) {
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index eb0ae856c7..5809a3dc2f 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -203,7 +203,7 @@ void Sound::playSound(int soundID) {
sound = (byte *)malloc(size);
memcpy(sound, ptr, size);
- stream = Audio::makeRawMemoryStream(sound, size, rate, Audio::FLAG_UNSIGNED);
+ stream = Audio::makeRawStream(sound, size, rate, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
}
// WORKAROUND bug # 1311447
@@ -226,7 +226,7 @@ void Sound::playSound(int soundID) {
// Allocate a sound buffer, copy the data into it, and play
sound = (byte *)malloc(size);
memcpy(sound, ptr, size);
- stream = Audio::makeRawMemoryStream(sound, size, rate, Audio::FLAG_UNSIGNED);
+ stream = Audio::makeRawStream(sound, size, rate, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID);
}
// Support for sampled sound effects in Monkey Island 1 and 2
@@ -298,7 +298,7 @@ void Sound::playSound(int soundID) {
// Allocate a sound buffer, copy the data into it, and play
sound = (byte *)malloc(size);
memcpy(sound, ptr + 6, size);
- stream = Audio::makeRawMemoryStream(sound, size, rate, Audio::FLAG_UNSIGNED);
+ stream = Audio::makeRawStream(sound, size, rate, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(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')) {
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index a1b97b6b1b..c926aa30e6 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -739,7 +739,7 @@ bool Intro::nextPart(uint16 *&data) {
// directly, but this will have to do for now.
memset(vData, 127, sizeof(DataFileHeader));
- stream = Audio::makeRawMemoryStream(vData, _skyDisk->_lastLoadedFileSize, 11025, Audio::FLAG_UNSIGNED);
+ stream = Audio::makeRawStream(vData, _skyDisk->_lastLoadedFileSize, 11025, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_voice, stream, SOUND_VOICE);
return true;
case WAITVOICE:
@@ -755,12 +755,12 @@ bool Intro::nextPart(uint16 *&data) {
return true;
case LOOPBG:
_mixer->stopID(SOUND_BG);
- stream = Audio::makeRawMemoryStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED);
+ stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, Audio::makeLoopingAudioStream(stream, 0), SOUND_BG);
return true;
case PLAYBG:
_mixer->stopID(SOUND_BG);
- stream = Audio::makeRawMemoryStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED);
+ stream = Audio::makeRawStream(_bgBuf + 256, _bgSize - 768, 11025, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSfx, stream, SOUND_BG);
return true;
case STOPBG:
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp
index eb9f1e57b9..179bb5e37a 100644
--- a/engines/sky/sound.cpp
+++ b/engines/sky/sound.cpp
@@ -1045,7 +1045,7 @@ void Sound::playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *h
_mixer->stopID(id);
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(buffer, size, 11025, flags);
+ Audio::AudioStream *stream = Audio::makeRawStream(buffer, size, 11025, flags);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, stream, id);
}
@@ -1111,7 +1111,7 @@ void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) {
uint32 dataLoop = READ_BE_UINT16(_sfxInfo + (sound << 3) + 6);
dataOfs += _sfxBaseOfs;
- Audio::SeekableAudioStream *stream = Audio::makeRawMemoryStream(_soundData + dataOfs, dataSize, sampleRate,
+ Audio::SeekableAudioStream *stream = Audio::makeRawStream(_soundData + dataOfs, dataSize, sampleRate,
Audio::FLAG_UNSIGNED, DisposeAfterUse::NO);
Audio::AudioStream *output = 0;
@@ -1251,7 +1251,7 @@ bool Sound::startSpeech(uint16 textNum) {
_mixer->stopID(SOUND_SPEECH);
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(playBuffer, speechSize, rate, Audio::FLAG_UNSIGNED);
+ Audio::AudioStream *stream = Audio::makeRawStream(playBuffer, speechSize, rate, Audio::FLAG_UNSIGNED);
_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_ingameSpeech, stream, SOUND_SPEECH);
return true;
}
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index a9fe37242b..e1a34d622f 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -272,7 +272,7 @@ void Sound::playSample(QueueElement *elem) {
if (READ_LE_UINT16(sampleData + 0x16) == 2)
flags |= Audio::FLAG_STEREO;
Audio::AudioStream *stream = Audio::makeLoopingAudioStream(
- Audio::makeRawMemoryStream(sampleData + 0x2C, size, 11025, flags, DisposeAfterUse::NO),
+ 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);
}
@@ -361,7 +361,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) {
uint32 size;
int16 *data = uncompressSpeech(index + _cowHeaderSize, sampleSize, &size);
if (data) {
- stream = Audio::makeRawMemoryStream((byte *)data, size, 11025, SPEECH_FLAGS);
+ stream = Audio::makeRawStream((byte *)data, size, 11025, SPEECH_FLAGS);
_mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, stream, SOUND_SPEECH_ID, speechVol, speechPan);
}
} else if (_cowMode == CowPSX && sampleSize != 0xffffffff) {
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index 0e637e0065..aa8006a3b6 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -898,7 +898,7 @@ void TeenAgentEngine::playSoundNow(byte id) {
in->read(data, size);
//debug(0, "playing %u samples...", size);
- Audio::AudioStream *stream = Audio::makeRawMemoryStream(data, size, 11025, 0);
+ Audio::AudioStream *stream = Audio::makeRawStream(data, size, 11025, 0);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_soundHandle, stream);
}
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index 379f1f2bb0..9beece40cb 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -154,7 +154,7 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound
#endif
break;
default:
- sampleStream = Audio::makeRawMemoryStream(sampleBuf, sampleLen, 22050, Audio::FLAG_UNSIGNED);
+ sampleStream = Audio::makeRawStream(sampleBuf, sampleLen, 22050, Audio::FLAG_UNSIGNED);
break;
}
if (sampleStream) {
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index c7de194436..f08cf4becc 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -599,7 +599,7 @@ Audio::RewindableAudioStream *AnimationSequencePlayer::loadSound(int index, Anim
uint8 *sampleData = (uint8 *)malloc(size);
if (sampleData) {
f.read(sampleData, size);
- stream = Audio::makeRawMemoryStream(sampleData, size, rate, flags);
+ stream = Audio::makeRawStream(sampleData, size, rate, flags);
}
}
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-17 21:51:35 +0000