[Scummvm-cvs-logs] SF.net SVN: scummvm:[36215] scummvm/trunk/sound/adpcm.cpp

[joostp at users.sourceforge.net]

Revision: 36215
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36215&view=rev
Author:   joostp
Date:     2009-02-04 16:40:44 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
make readBufferTinsel*() output in native endianness, rather than little endian.

Modified Paths:
--------------
    scummvm/trunk/sound/adpcm.cpp

Modified: scummvm/trunk/sound/adpcm.cpp
===================================================================
--- scummvm/trunk/sound/adpcm.cpp	2009-02-04 16:08:32 UTC (rev 36214)
+++ scummvm/trunk/sound/adpcm.cpp	2009-02-04 16:40:44 UTC (rev 36215)
@@ -371,8 +371,8 @@
 		for (; samples < numSamples && _blockPos < _blockAlign && !_stream->eos() && _stream->pos() < _endpos; samples += 2, _blockPos++) {
 			// Read 1 byte = 8 bits = two 4 bit blocks
 			data = _stream->readByte();
-			buffer[samples] = TO_LE_16(decodeTinsel((data << 8) & 0xF000, eVal));
-			buffer[samples+1] = TO_LE_16(decodeTinsel((data << 12) & 0xF000, eVal));
+			buffer[samples] = decodeTinsel((data << 8) & 0xF000, eVal);
+			buffer[samples+1] = decodeTinsel((data << 12) & 0xF000, eVal);
 		}
 	}
 
@@ -397,21 +397,21 @@
 			switch (_chunkPos) {
 			case 0:
 				_chunkData = _stream->readByte();
-				buffer[samples] = TO_LE_16(decodeTinsel((_chunkData << 8) & 0xFC00, eVal));
+				buffer[samples] = decodeTinsel((_chunkData << 8) & 0xFC00, eVal);
 				break;
 			case 1:
 				_chunkData = (_chunkData << 8) | (_stream->readByte());
-				buffer[samples] = TO_LE_16(decodeTinsel((_chunkData << 6) & 0xFC00, eVal));
+				buffer[samples] = decodeTinsel((_chunkData << 6) & 0xFC00, eVal);
 				_blockPos++;
 				break;
 			case 2:
 				_chunkData = (_chunkData << 8) | (_stream->readByte());
-				buffer[samples] = TO_LE_16(decodeTinsel((_chunkData << 4) & 0xFC00, eVal));
+				buffer[samples] = decodeTinsel((_chunkData << 4) & 0xFC00, eVal);
 				_blockPos++;
 				break;
 			case 3:
 				_chunkData = (_chunkData << 8);
-				buffer[samples] = TO_LE_16(decodeTinsel((_chunkData << 2) & 0xFC00, eVal));
+				buffer[samples] = decodeTinsel((_chunkData << 2) & 0xFC00, eVal);
 				_blockPos++;
 				break;
 			}
@@ -439,7 +439,7 @@
 		for (; samples < numSamples && _blockPos < _blockAlign && !_stream->eos() && _stream->pos() < _endpos; samples++, _blockPos++) {
 			// Read 1 byte = 8 bits = one 8 bit block
 			data = _stream->readByte();
-			buffer[samples] = TO_LE_16(decodeTinsel(data << 8, eVal));
+			buffer[samples] = decodeTinsel(data << 8, eVal);
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.