[Scummvm-cvs-logs] SF.net SVN: scummvm:[35426] scummvm/trunk/graphics/smk_player.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Dec 18 20:32:44 CET 2008
Revision: 35426
http://scummvm.svn.sourceforge.net/scummvm/?rev=35426&view=rev
Author: thebluegr
Date: 2008-12-18 19:32:44 +0000 (Thu, 18 Dec 2008)
Log Message:
-----------
Oops, base values are read in the correct order now
Modified Paths:
--------------
scummvm/trunk/graphics/smk_player.cpp
Modified: scummvm/trunk/graphics/smk_player.cpp
===================================================================
--- scummvm/trunk/graphics/smk_player.cpp 2008-12-18 19:18:45 UTC (rev 35425)
+++ scummvm/trunk/graphics/smk_player.cpp 2008-12-18 19:32:44 UTC (rev 35426)
@@ -744,18 +744,17 @@
// Base values, stored as big endian
- // Right channel
- bases[0] = (!is16Bits) ? audioBS.getBits8() : (audioBS.getBits8() << 8) || audioBS.getBits8();
-
- // Left channel, if the sample is stereo
if (isStereo)
- bases[1] = (!is16Bits) ? audioBS.getBits8() : (audioBS.getBits8() << 8) || audioBS.getBits8();
-
+ bases[1] = (!is16Bits) ? audioBS.getBits8() : (audioBS.getBits8() << 8) || audioBS.getBits8(); // Right channel
+
+ bases[0] = (!is16Bits) ? audioBS.getBits8() : (audioBS.getBits8() << 8) || audioBS.getBits8(); // Left channel
+
// Next follow the deltas, which are added to the corresponding base values and are stored as little endian
// We store the unpacked bytes in big endian format
while (curPos < unpackedSize) {
- // If the sample is stereo, we get first the data for the left and then for the right channel
+ // If the sample is stereo, the data is stored for the left and right channel, respectively
+ // (the exact opposite to the base values)
if (!is16Bits) {
for (k = 0; k < (isStereo ? 2 : 1); k++) {
*curPointer++ = (byte)(bases[k] + audioTrees[k]->getCode(audioBS));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list