[Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 tables.cpp,1.4,1.5

[Jerome Fisher]

Update of /cvsroot/scummvm/scummvm/backends/midi/mt32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17894

Modified Files:
	tables.cpp 
Log Message:
- Now actually read and write the 4 bytes of tuning frequency info in the header.


Index: tables.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/mt32/tables.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tables.cpp	28 Nov 2004 05:35:07 -0000	1.4
+++ tables.cpp	29 Nov 2004 01:05:15 -0000	1.5
@@ -594,7 +594,7 @@
 	};
 	char filename[64];
 	int intRate = (int)rate;
-	char version[4] = {0, 0, 0, 2};
+	char version[4] = {0, 0, 0, 3};
 	sprintf(filename, "waveformcache-%d-%.2f.raw", intRate, masterTune);
 
 	File *file = NULL;
@@ -617,9 +617,9 @@
 	bool reading = false;
 	file = synth->openFile(filename, File::OpenMode_read);
 	if (file != NULL) {
-		char fileHeader[16];
-		if (file->read(fileHeader, 16) == 16) {
-			if (memcmp(fileHeader, header, 16) == 0) {
+		char fileHeader[20];
+		if (file->read(fileHeader, 20) == 20) {
+			if (memcmp(fileHeader, header, 20) == 0) {
 				Bit16u endianCheck;
 				if (file->readBit16u(&endianCheck)) {
 					if (endianCheck == 1) {
@@ -662,7 +662,7 @@
 	if (file == NULL) {
 		file = synth->openFile(filename, File::OpenMode_write);
 		if (file != NULL) {
-			if (file->write(header, 16) == 16 && file->writeBit16u(1)) {
+			if (file->write(header, 20) == 20 && file->writeBit16u(1)) {
 				for (int f = 0; f < NUM_NOTES; f++) {
 					for (int i = 0; i < 3 && file != NULL; i++) {
 						int len = noteLookups[f].waveformSize[i];