[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.65,1.66

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17911

Modified Files:
	dimuse_sndmgr.cpp 
Log Message:
added support for *.map files version 2

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- dimuse_sndmgr.cpp	28 Jan 2005 23:30:51 -0000	1.65
+++ dimuse_sndmgr.cpp	30 Jan 2005 20:45:02 -0000	1.66
@@ -87,10 +87,13 @@
 	file->seek(offset, SEEK_SET);
 	uint32 tag = file->readUint32BE();
 	assert(tag == 'RMAP');
-	assert(file->readUint32BE() == 1); // version
-	sound->bits = 16;
-	sound->freq = 22050;
-	sound->channels = 2;
+	int32 version = file->readUint32BE();
+	if (version != 2) {
+		error("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version number, expected 2, but it's: %d.", version);
+	}
+	sound->bits = file->readUint32BE();
+	sound->freq = file->readUint32BE();
+	sound->channels = file->readUint32BE();
 	sound->numRegions = file->readUint32BE();
 	sound->numJumps = file->readUint32BE();
 	sound->numSyncs = file->readUint32BE();
@@ -595,8 +598,6 @@
 					soundHandle->compressedStream = makeMP3Stream(cmpFile, len);
 #endif
 				assert(soundHandle->compressedStream);
-				assert(soundHandle->compressedStream->getRate() == 22050);
-				assert(soundHandle->compressedStream->isStereo());
 			}
 			strcpy(soundHandle->lastFileName, fileName);
 		}