Endian-safe read-and-advance helper functions are

now based on the READ_LE_* and READ_BE_* macros.
Very slight performance gain, woo hoo.

svn-id: r11558

1 files changed, 4 insertions, 6 deletions

diff --git a/sound/midiparser.h b/sound/midiparser.h
index 30d3243667..502fd9c14f 100644
--- a/sound/midiparser.h
+++ b/sound/midiparser.h
@@ -190,9 +190,8 @@ protected:
 	 *  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 @@ protected:
 	 *  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;
 	}