[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.58,1.59
Pawel Kolodziejski
aquadran at users.sourceforge.net
Thu Jan 27 14:11:53 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23687/scummvm/scumm/imuse_digi
Modified Files:
dimuse_sndmgr.cpp
Log Message:
fix for shadowed variable
Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- dimuse_sndmgr.cpp 27 Jan 2005 12:08:09 -0000 1.58
+++ dimuse_sndmgr.cpp 27 Jan 2005 16:48:30 -0000 1.59
@@ -565,10 +565,10 @@
char fileName[24];
sprintf(fileName, "%s_reg%03d.ogg", soundHandle->name, region);
if (scumm_stricmp(fileName, soundHandle->lastFileName) != 0) {
- int32 offs = 0, size = 0;
- File *oggFile = soundHandle->bundle->getFile(fileName, offs, size);
+ int32 offs = 0, len = 0;
+ File *oggFile = soundHandle->bundle->getFile(fileName, offs, len);
if (!soundHandle->compressedStream) {
- soundHandle->compressedStream = makeVorbisStream(oggFile, size);
+ soundHandle->compressedStream = makeVorbisStream(oggFile, len);
assert(soundHandle->compressedStream);
assert(soundHandle->compressedStream->getRate() == 22050);
assert(soundHandle->compressedStream->isStereo());
More information about the Scummvm-git-logs
mailing list