[Scummvm-cvs-logs] SF.net SVN: scummvm: [27739] scummvm/trunk/engines/saga/music.cpp

[Kirben at users.sourceforge.net]

Revision: 27739
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27739&view=rev
Author:   Kirben
Date:     2007-06-26 19:24:19 -0700 (Tue, 26 Jun 2007)

Log Message:
-----------
Fix compiler warning.

Modified Paths:
--------------
    scummvm/trunk/engines/saga/music.cpp

Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp	2007-06-27 01:47:20 UTC (rev 27738)
+++ scummvm/trunk/engines/saga/music.cpp	2007-06-27 02:24:19 UTC (rev 27739)
@@ -418,19 +418,19 @@
 					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 @@
 #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:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.