[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.39,1.40 dimuse_sndmgr.h,1.18,1.19

Max Horn fingolfin at sc8-pr-cvs1.sourceforge.net
Thu Jan 22 11:45:51 CET 2004


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

Modified Files:
	dimuse.cpp dimuse_sndmgr.h 
Log Message:
Fix for bug #882081

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- dimuse.cpp	19 Jan 2004 19:25:11 -0000	1.39
+++ dimuse.cpp	22 Jan 2004 19:43:35 -0000	1.40
@@ -286,7 +286,9 @@
 				channels = _sound->getChannels(_track[l].soundHandle);
 				freq = _sound->getFreq(_track[l].soundHandle);
 				
+				assert(bits == 8 || bits == 12 || bits == 16);
 				assert(channels == 1 || channels == 2);
+				assert(0 < freq && freq <= 65535);
 
 				_track[l].iteration = _track[l].pullSize = freq * channels;
 

Index: dimuse_sndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dimuse_sndmgr.h	18 Jan 2004 17:01:03 -0000	1.18
+++ dimuse_sndmgr.h	22 Jan 2004 19:43:36 -0000	1.19
@@ -66,7 +66,7 @@
 public:
 
 	struct soundStruct {
-		int16 freq;			// frequency
+		uint16 freq;			// frequency
 		byte channels;		// stereo or mono
 		byte bits;			// 8, 12, 16
 		int8 numJumps;		// number of Jumps





More information about the Scummvm-git-logs mailing list