aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2007-06-27 02:24:19 +0000
committerTravis Howell2007-06-27 02:24:19 +0000
commitb939c15f9d217597c21733667ce94f885c248dc8 (patch)
tree8c7f6a5c7c906e805e8536e00b7c382b4ac07da6
parent23426fcea594e20c55b04f00e1e7dce402492247 (diff)
downloadscummvm-rg350-b939c15f9d217597c21733667ce94f885c248dc8.tar.gz
scummvm-rg350-b939c15f9d217597c21733667ce94f885c248dc8.tar.bz2
scummvm-rg350-b939c15f9d217597c21733667ce94f885c248dc8.zip
Fix compiler warning.
svn-id: r27739
-rw-r--r--engines/saga/music.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index b74bd4818d..71b6964530 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -418,19 +418,19 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
audioStream = new RAWInputStream(_vm, _musicContext, resourceId - 9, flags == MUSIC_LOOP, loopStart);
} else {
// compressed digital music
- ResourceData * resourceData;
+ ResourceData * musicResourceData;
Common::File *_file;
byte compressedHeader[10];
GameSoundTypes soundType;
- resourceData = _vm->_resource->getResourceData(_musicContext, resourceId - 9);
- _file = _musicContext->getFile(resourceData);
+ musicResourceData = _vm->_resource->getResourceData(_musicContext, resourceId - 9);
+ _file = _musicContext->getFile(musicResourceData);
if (_vm->getMusicInfo() == NULL) {
error("RAWInputStream() wrong musicInfo");
}
- _file->seek((long)resourceData->offset, SEEK_SET);
+ _file->seek((long)musicResourceData->offset, SEEK_SET);
_file->read(compressedHeader, 9);
@@ -446,19 +446,19 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
#ifdef USE_MAD
case kSoundMP3:
debug(1, "Playing MP3 compressed digital music");
- audioStream = Audio::makeMP3Stream(_file, resourceData->size);
+ audioStream = Audio::makeMP3Stream(_file, musicResourceData->size);
break;
#endif
#ifdef USE_VORBIS
case kSoundOGG:
debug(1, "Playing OGG compressed digital music");
- audioStream = Audio::makeVorbisStream(_file, resourceData->size);
+ audioStream = Audio::makeVorbisStream(_file, musicResourceData->size);
break;
#endif
#ifdef USE_FLAC
case kSoundFLAC:
debug(1, "Playing FLAC compressed digital music");
- audioStream = Audio::makeFlacStream(_file, resourceData->size);
+ audioStream = Audio::makeFlacStream(_file, musicResourceData->size);
break;
#endif
default: