[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.346,1.347

[Travis Howell]

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

Modified Files:
	sound.cpp 
Log Message:

Add correct sample rate for DOS HE 6.0 games.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -d -r1.346 -r1.347
--- sound.cpp	13 Jul 2004 01:40:47 -0000	1.346
+++ sound.cpp	13 Jul 2004 05:02:27 -0000	1.347
@@ -229,18 +229,18 @@
 	else if (READ_UINT32(ptr) == MKID('DIGI')) {
 		// TODO - discover what data the first chunk, HSHD, contains
 		// it might be useful here.
+		rate = READ_LE_UINT16(ptr + 22);
+
 		ptr += 8 + READ_BE_UINT32(ptr+12);
 		if (READ_UINT32(ptr) != MKID('SDAT'))
 			return;	// abort
 
 		size = READ_BE_UINT32(ptr+4) - 8;
-		// FIXME - what value here ?!? 11025 is just a guess based on strings in w32 bin, prev guess 8000
 		if (_overrideFreq) {
 			// Used by the piano in Fatty Bear's Birthday Surprise
 			rate = _overrideFreq;
 			_overrideFreq = 0;
-		} else
-			rate = 11025;
+		}
 
 		// Allocate a sound buffer, copy the data into it, and play
 		sound = (char *)malloc(size);
@@ -249,7 +249,6 @@
 	}
 	else if (READ_UINT32(ptr) == MKID('MRAW')) {
 		// pcm music in 3DO humongous games
-		// TODO play via imuse so isSoundRunning can properly report music value?
 		ptr += 8 + READ_BE_UINT32(ptr+12);
 		if (READ_UINT32(ptr) != MKID('SDAT'))
 			return;