diff options
| author | Johannes Schickel | 2010-01-30 15:26:54 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-30 15:26:54 +0000 |
| commit | a505d32eff97e31ac73495e202f9c01f6490dcf8 (patch) | |
| tree | 30e61278463fd597ec20044fc2036f4ef0f29d08 /engines/sci | |
| parent | 8e3646e062528d1604d28676fa2faec5c5ac878b (diff) | |
| download | scummvm-rg350-a505d32eff97e31ac73495e202f9c01f6490dcf8.tar.gz scummvm-rg350-a505d32eff97e31ac73495e202f9c01f6490dcf8.tar.bz2 scummvm-rg350-a505d32eff97e31ac73495e202f9c01f6490dcf8.zip | |
Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream.
svn-id: r47716
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/sound/audio.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/iterator/iterator.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/music.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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; |