[Scummvm-cvs-logs] CVS: residual smush.cpp,1.44,1.45 vima.cpp,1.5,1.6

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Dec 10 18:04:05 CET 2004


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

Modified Files:
	smush.cpp vima.cpp 
Log Message:
vima and smush audio output is little endian now

Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- smush.cpp	31 Oct 2004 09:38:13 -0000	1.44
+++ smush.cpp	10 Dec 2004 21:35:17 -0000	1.45
@@ -108,13 +108,8 @@
 void Smush::handleWave(const byte *src, uint32 size) {
 	int16 *dst = new int16[size * _channels];
 	decompressVima((char *)src, dst, size * _channels * 2, destTable);
-
-#ifndef SYSTEM_BIG_ENDIAN
-	for (uint32 j = 0; j < size * _channels; j++)
-		dst[j] = SWAP_BYTES_16(dst[j]);
-#endif
 	
-	int flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE;
+	int flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_LITTLE_ENDIAN | SoundMixer::FLAG_AUTOFREE;
 	if (_channels == 2)
 		flags |= SoundMixer::FLAG_STEREO;
 

Index: vima.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/vima.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vima.cpp	10 Dec 2004 21:25:33 -0000	1.5
+++ vima.cpp	10 Dec 2004 21:35:17 -0000	1.6
@@ -178,7 +178,7 @@
 					outputWord = 0x7fff;
 			}
 
-			*destPos = outputWord;
+			WRITE_LE_UINT16(destPos, outputWord);
 			destPos += numChannels;
 
 			currTablePos += offsets[numBits - 2][val];





More information about the Scummvm-git-logs mailing list