diff options
| author | Andrew Kurushin | 2009-12-04 17:52:42 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2009-12-04 17:52:42 +0000 |
| commit | aa147a2f5af167048b3d57da558bc39a91c3a936 (patch) | |
| tree | c0d76d59a96f4b415f5186f74dfcb73c27775fc6 /engines/saga/music.cpp | |
| parent | 4fb779dbaf85d93c776549cdc4903c5a671013a4 (diff) | |
| download | scummvm-rg350-aa147a2f5af167048b3d57da558bc39a91c3a936.tar.gz scummvm-rg350-aa147a2f5af167048b3d57da558bc39a91c3a936.tar.bz2 scummvm-rg350-aa147a2f5af167048b3d57da558bc39a91c3a936.zip | |
refactor resource module:
- struct ResourceContext => class ResourceContext
- replace "*alloc","free" with array templates
- simplify createContexts routines
svn-id: r46254
Diffstat (limited to 'engines/saga/music.cpp')
| -rw-r--r-- | engines/saga/music.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 31517f403e..aeca848719 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -296,12 +296,12 @@ void Music::play(uint32 resourceId, MusicFlags flags) { // Digital music ResourceData *resData = _digitalMusicContext->getResourceData(resourceId - 9); Common::File *musicFile = _digitalMusicContext->getFile(resData); - int offs = (_digitalMusicContext->isCompressed) ? 9 : 0; + int offs = (_digitalMusicContext->isCompressed()) ? 9 : 0; Common::SeekableSubReadStream *musicStream = new Common::SeekableSubReadStream(musicFile, (uint32)resData->offset + offs, (uint32)resData->offset + resData->size - offs); - if (!_digitalMusicContext->isCompressed) { + if (!_digitalMusicContext->isCompressed()) { byte musicFlags = Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_STEREO | Audio::Mixer::FLAG_16BITS | Audio::Mixer::FLAG_LITTLE_ENDIAN; if (flags == MUSIC_LOOP) |