diff options
| author | Johannes Schickel | 2010-01-30 15:17:57 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-30 15:17:57 +0000 |
| commit | ec3f58e626a0645c21bc76fbc7cbd2a58eeee43e (patch) | |
| tree | eef0ab4cdc802643b252caa4fe9fab697890098c /engines | |
| parent | 17cebab3549bac2ae57d0550d477c6cafbee70c5 (diff) | |
| download | scummvm-rg350-ec3f58e626a0645c21bc76fbc7cbd2a58eeee43e.tar.gz scummvm-rg350-ec3f58e626a0645c21bc76fbc7cbd2a58eeee43e.tar.bz2 scummvm-rg350-ec3f58e626a0645c21bc76fbc7cbd2a58eeee43e.zip | |
- Mark makeRawDiskStream factory as deprecated.
- Introduce two new makeRawStream factories, one is using RawStreamBlockList instead of an RawDiskStreamAudioBlock array.
svn-id: r47713
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/saga/music.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index b51a387d61..cc3a52b975 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -306,10 +306,7 @@ void Music::play(uint32 resourceId, MusicFlags flags) { if (!_digitalMusicContext->isCompressed()) { byte musicFlags = Audio::FLAG_STEREO | Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN; - Audio::RawDiskStreamAudioBlock audioBlocks[1]; - audioBlocks[0].pos = 0; - audioBlocks[0].len = resData->size / 2; // 16-bit sound - audioStream = Audio::makeRawDiskStream(musicStream, audioBlocks, 1, 11025, musicFlags, DisposeAfterUse::YES); + audioStream = Audio::makeRawStream(musicStream, 11025, musicFlags, DisposeAfterUse::YES); } else { // Read compressed header to determine compression type musicFile->seek((uint32)resData->offset, SEEK_SET); |