diff options
| author | Max Horn | 2010-01-23 23:55:35 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-23 23:55:35 +0000 |
| commit | 4b996e7de7d25a650f1ae73722af827fcab7b4d6 (patch) | |
| tree | ea6e7a352a7adaf3e04fbb64716ed8c04c85ea1b /engines/sci | |
| parent | 9369c9f3c518d394b50b04afcf91e7cc5f2f39be (diff) | |
| download | scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.tar.gz scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.tar.bz2 scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.zip | |
Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
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 d2986a301b..e350e3dba2 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -245,7 +245,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32 } if (data) - audioStream = Audio::makeRawMemoryStream(data, size, DisposeAfterUse::YES, _audioRate, flags); + audioStream = Audio::makeRawMemoryStream(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 2c54b0bdee..d4e79590ca 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, DisposeAfterUse::YES, rate, flags, 0, 0); + return Audio::makeRawMemoryStream(sound, size, rate, flags); } Audio::AudioStream *Sci0SongIterator::getAudioStream() { diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 13be36b488..6af0597027 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -184,7 +184,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) { // Amiga SCI1 games had signed sound data if (_soundVersion >= SCI_VERSION_1_EARLY && ((SciEngine *)g_engine)->getPlatform() == Common::kPlatformAmiga) flags = 0; - pSnd->pStreamAud = Audio::makeRawMemoryStream(channelData, track->digitalSampleSize, DisposeAfterUse::NO, track->digitalSampleRate, flags); + pSnd->pStreamAud = Audio::makeRawMemoryStream(channelData, track->digitalSampleSize, track->digitalSampleRate, flags, DisposeAfterUse::NO); delete pSnd->pLoopStream; pSnd->pLoopStream = 0; pSnd->soundType = Audio::Mixer::kSFXSoundType; |