[Scummvm-cvs-logs] CVS: scummvm/sound midiparser.h,1.21,1.22

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv1009/scummvm/sound

Modified Files:
	midiparser.h 
Log Message:
Endian-safe read-and-advance helper functions are
now based on the READ_LE_* and READ_BE_* macros.
Very slight performance gain, woo hoo.

Index: midiparser.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- midiparser.h	3 Oct 2003 23:34:05 -0000	1.21
+++ midiparser.h	10 Dec 2003 23:52:29 -0000	1.22
@@ -190,9 +190,8 @@
 	 *  the pointer.
 	 */
 	uint32 read4high (byte * &data) {
-		uint32 val = 0;
-		int i;
-		for (i = 0; i < 4; ++i) val = (val << 8) | *data++;
+		uint32 val = READ_BE_UINT32 (data);
+		data += 4;
 		return val;
 	}
 
@@ -202,9 +201,8 @@
 	 *  the pointer.
 	 */
 	uint16 read2low  (byte * &data) {
-		uint16 val = 0;
-		int i;
-		for (i = 0; i < 2; ++i) val |= (*data++) << (i * 8);
+		uint16 val = READ_LE_UINT16 (data);
+		data += 2;
 		return val;
 	}