[Scummvm-cvs-logs] CVS: residual smush.cpp,1.47,1.48 vima.cpp,1.7,1.8
Pawel Kolodziejski
aquadran at users.sourceforge.net
Tue Dec 28 10:22:01 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.40,1.41
- Next message: [Scummvm-cvs-logs] CVS: residual/imuse imuse.cpp,1.4,1.5 imuse.h,1.1,1.2 imuse_mcmp_mgr.cpp,1.1,1.2 imuse_music.cpp,1.2,1.3 imuse_script.cpp,1.1,1.2 imuse_sndmgr.cpp,1.2,1.3 imuse_sndmgr.h,1.2,1.3 imuse_tables.cpp,1.5,1.6 imuse_track.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5867
Modified Files:
smush.cpp vima.cpp
Log Message:
cleanup
Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- smush.cpp 28 Dec 2004 08:05:17 -0000 1.47
+++ smush.cpp 28 Dec 2004 18:21:05 -0000 1.48
@@ -32,7 +32,7 @@
extern SoundMixer *g_mixer;
static uint16 smushDestTable[5786];
void vimaInit(uint16 *destTable);
-void decompressVima(const char *src, int16 *dest, int destLen, uint16 *destTable);
+void decompressVima(const byte *src, int16 *dest, int destLen, uint16 *destTable);
extern SoundMixer *g_mixer;
@@ -101,18 +101,11 @@
_file.close();
}
-void Smush::handleBlocky16(byte *src) {
- _blocky16.decode(_internalBuffer, src);
-}
-
void Smush::handleWave(const byte *src, uint32 size) {
int16 *dst = new int16[size * _channels];
- decompressVima((char *)src, dst, size * _channels * 2, smushDestTable);
-
+ decompressVima(src, dst, size * _channels * 2, smushDestTable);
+
int flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE;
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
- flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
-#endif
if (_channels == 2)
flags |= SoundMixer::FLAG_STEREO;
@@ -152,7 +145,7 @@
do {
if (READ_BE_UINT32(frame + pos) == MKID_BE('Bl16')) {
- handleBlocky16(frame + pos + 8);
+ _blocky16.decode(_internalBuffer, frame + pos + 8);
pos += READ_BE_UINT32(frame + pos + 4) + 8;
} else if (READ_BE_UINT32(frame + pos) == MKID_BE('Wave')) {
int decompressed_size = READ_BE_UINT32(frame + pos + 8);
Index: vima.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/vima.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- vima.cpp 11 Dec 2004 20:26:24 -0000 1.7
+++ vima.cpp 28 Dec 2004 18:21:05 -0000 1.8
@@ -98,7 +98,7 @@
int destTableStartPos, incer;
for (destTableStartPos = 0, incer = 0; destTableStartPos < 64; destTableStartPos++, incer++) {
- unsigned int destTablePos, imcTable1Pos;
+ int destTablePos, imcTable1Pos;
for (imcTable1Pos = 0, destTablePos = destTableStartPos;
imcTable1Pos < sizeof(imcTable1) / sizeof(imcTable1[0]); imcTable1Pos++, destTablePos += 64) {
int put = 0, count, tableValue;
@@ -112,12 +112,12 @@
}
}
-void decompressVima(const char *src, int16 *dest, int destLen, uint16 *destTable) {
+void decompressVima(const byte *src, int16 *dest, int destLen, uint16 *destTable) {
int numChannels = 1;
- uint8 sBytes[2];
+ byte sBytes[2];
int16 sWords[2];
- sBytes[0] = *(uint8*)(src++);
+ sBytes[0] = *(uint8 *)(src++);
if (sBytes[0] & 0x80) {
sBytes[0] = ~sBytes[0];
numChannels = 2;
@@ -125,7 +125,7 @@
sWords[0] = READ_BE_UINT16(src);
src += 2;
if (numChannels > 1) {
- sBytes[1] = *(uint8*)(src++);
+ sBytes[1] = *(uint8 *)(src++);
sWords[1] = READ_BE_UINT16(src);
src += 2;
}
@@ -158,7 +158,7 @@
highBit = 0;
if (val == lowBits) {
- outputWord = ((signed short) (bits << bitPtr) & 0xffffff00);
+ outputWord = ((int16)(bits << bitPtr) & 0xffffff00);
bits = ((bits & 0xff) << 8) | *(uint8*)(src++);
outputWord |= ((bits >> (8 - bitPtr)) & 0xff);
bits = ((bits & 0xff) << 8) | *(uint8*)(src++);
@@ -178,7 +178,7 @@
outputWord = 0x7fff;
}
- *destPos = outputWord;
+ WRITE_BE_UINT16(destPos, outputWord);
destPos += numChannels;
currTablePos += offsets[numBits - 2][val];
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.40,1.41
- Next message: [Scummvm-cvs-logs] CVS: residual/imuse imuse.cpp,1.4,1.5 imuse.h,1.1,1.2 imuse_mcmp_mgr.cpp,1.1,1.2 imuse_music.cpp,1.2,1.3 imuse_script.cpp,1.1,1.2 imuse_sndmgr.cpp,1.2,1.3 imuse_sndmgr.h,1.2,1.3 imuse_tables.cpp,1.5,1.6 imuse_track.cpp,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list