[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_bndmgr.cpp,1.36,1.37 dimuse_bndmgr.h,1.17,1.18 dimuse_codecs.cpp,1.12,1.13 dimuse_music.cpp,1.38,1.39 dimuse_sndmgr.cpp,1.72,1.73 dimuse_sndmgr.h,1.33,1.34

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/scumm/imuse_digi

Modified Files:
	dimuse_bndmgr.cpp dimuse_bndmgr.h dimuse_codecs.cpp 
	dimuse_music.cpp dimuse_sndmgr.cpp dimuse_sndmgr.h 
Log Message:
Remove trailing whitespaces.


Index: dimuse_bndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- dimuse_bndmgr.cpp	30 Jun 2005 23:29:34 -0000	1.36
+++ dimuse_bndmgr.cpp	30 Jul 2005 21:11:32 -0000	1.37
@@ -85,7 +85,7 @@
 		if (tag == 'LB23')
 			_budleDirCache[freeSlot].compressedBun = true;
 		offset = file.readUint32BE();
-		
+
 		strcpy(_budleDirCache[freeSlot].fileName, filename);
 		_budleDirCache[freeSlot].numFiles = file.readUint32BE();
 		_budleDirCache[freeSlot].bundleTable = (AudioTable *) malloc(_budleDirCache[freeSlot].numFiles * sizeof(AudioTable));

Index: dimuse_bndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- dimuse_bndmgr.h	30 Jun 2005 23:29:34 -0000	1.17
+++ dimuse_bndmgr.h	30 Jul 2005 21:11:32 -0000	1.18
@@ -42,7 +42,7 @@
 		int32 numFiles;
 		bool compressedBun;
 	} _budleDirCache[4];
-	
+
 public:
 	BundleDirCache();
 	~BundleDirCache();
@@ -75,7 +75,7 @@
 	byte *_compInput;
 	int _outputSize;
 	int _lastBlock;
-	
+
 	bool loadCompTable(int32 index);
 
 public:

Index: dimuse_codecs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_codecs.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dimuse_codecs.cpp	27 Jun 2005 00:00:32 -0000	1.12
+++ dimuse_codecs.cpp	30 Jul 2005 21:11:32 -0000	1.13
@@ -48,7 +48,7 @@
  * The "IMC" codec below (see cases 13 & 15 in decompressCodec) is actually a
  * variant of the IMA codec, see also
  *   <http://home.pcisys.net/~melanson/codecs/simpleaudio.html>
- * 
+ *
  * It is somewhat different, though: the standard ADPCM codecs use a fixed
  * size for their data packets (4 bits), while the codec implemented here
  * varies the size of each "packet" between 2 and 7 bits.
@@ -80,27 +80,27 @@
 	{
 		0xFF, 0x04
 	},
-	
+
 	{
 		0xFF, 0xFF, 0x02, 0x08
 	},
-	
+
 	{
 		0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x02, 0x04, 0x06
 	},
-	
+
 	{
 		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 		0x01, 0x02, 0x04, 0x06, 0x08, 0x0C, 0x10, 0x20
 	},
-	
+
 	{
 		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 		0x01, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E,
 		0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x1C, 0x20
 	},
-	
+
 	{
 		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -122,12 +122,12 @@
 
 void initializeImcTables() {
 	int pos;
-	
+
 #ifdef __PALM_OS__
 	if (!_destImcTable) _destImcTable = (byte *)calloc(89, sizeof(byte));
 	if (!_destImcTable2) _destImcTable2 = (uint32 *)calloc(89 * 64, sizeof(uint32));
 #endif
-	
+
 	for (pos = 0; pos <= 88; ++pos) {
 		byte put = 1;
 		int32 tableValue = ((imcTable[pos] * 4) / 7) / 2;
@@ -537,7 +537,7 @@
 			// Decoder for the the IMA ADPCM variants used in COMI.
 			// Contrary to regular IMA ADPCM, this codec uses a variable
 			// bitsize for the encoded data.
-		
+
 			const int MAX_CHANNELS = 2;
 			int32 outputSamplesLeft;
 			int32 destPos;
@@ -558,7 +558,7 @@
 			outputSamplesLeft = 0x1000;
 
 			// Every data packet contains 0x2000 bytes of audio data
-			// when extracted. In order to encode bigger data sets, 
+			// when extracted. In order to encode bigger data sets,
 			// one has to split the data into multiple blocks.
 			//
 			// Every block starts with a 2 byte word. If that word is
@@ -604,7 +604,7 @@
 				destPos = chan * 2;
 
 				const int bound = (channels == 1)
-									? outputSamplesLeft 
+									? outputSamplesLeft
 									: ((chan == 0)
 										? (outputSamplesLeft+1) / 2
 										: outputSamplesLeft / 2);
@@ -612,7 +612,7 @@
 					// Determine the size (in bits) of the next data packet
 					const int32 curTableEntryBitCount = _destImcTable[curTablePos];
 					assert(2 <= curTableEntryBitCount && curTableEntryBitCount <= 7);
-					
+
 					// Read the next data packet
 					const byte *readPos = src + (totalBitOffset >> 3);
 					const uint16 readWord = (uint16)(READ_BE_UINT16(readPos) << (totalBitOffset & 7));
@@ -620,7 +620,7 @@
 
 					// Advance read position to the next data packet
 					totalBitOffset += curTableEntryBitCount;
-					
+
 					// Decode the data packet into a delta value for the output signal.
 					const byte signBitMask = (1 << (curTableEntryBitCount - 1));
 					const byte dataBitMask = (signBitMask - 1);
@@ -629,13 +629,13 @@
 					const int32 tmpA = (data << (7 - curTableEntryBitCount));
 					const int32 imcTableEntry = imcTable[curTablePos] >> (curTableEntryBitCount - 1);
 					int32 delta = imcTableEntry + _destImcTable2[tmpA + (curTablePos * 64)];
-					
+
 					// The topmost bit in the data packet tells is a sign bit
 					if ((packet & signBitMask) != 0) {
 						delta = -delta;
 					}
-					
-					// Accumulate the delta onto the output data 
+
+					// Accumulate the delta onto the output data
 					outputWord += delta;
 
 					// Clip outputWord to 16 bit signed, and write it into the destination stream

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- dimuse_music.cpp	24 Jun 2005 15:23:21 -0000	1.38
+++ dimuse_music.cpp	30 Jul 2005 21:11:32 -0000	1.39
@@ -93,7 +93,7 @@
 			break;
 		}
 	}
-	
+
 	if (num == -1)
 		return;
 

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- dimuse_sndmgr.cpp	30 Jun 2005 23:29:34 -0000	1.72
+++ dimuse_sndmgr.cpp	30 Jul 2005 21:11:32 -0000	1.73
@@ -339,7 +339,7 @@
 	const bool header_outside = ((_vm->_gameId == GID_CMI) && !(_vm->_features & GF_DEMO));
 	bool result = false;
 	byte *ptr = NULL;
-	
+
 	switch (soundType) {
 	case IMUSE_RESOURCE:
 		assert(soundName[0] == 0);	// Paranoia check
@@ -502,7 +502,7 @@
 				return l;
 		}
 	}
-	
+
 	return -1;
 }
 
@@ -571,7 +571,7 @@
 	} else if (soundHandle->resPtr) {
 		*buf = (byte *)malloc(size);
 		memcpy(*buf, soundHandle->resPtr + start + offset + header_size, size);
-	} else if ((soundHandle->bundle) && (soundHandle->compressed)) {	
+	} else if ((soundHandle->bundle) && (soundHandle->compressed)) {
 		*buf = (byte *)malloc(size);
 		char fileName[24];
 		sprintf(fileName, "%s_reg%03d", soundHandle->name, region);

Index: dimuse_sndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- dimuse_sndmgr.h	24 Jun 2005 15:23:21 -0000	1.33
+++ dimuse_sndmgr.h	30 Jul 2005 21:11:32 -0000	1.34
@@ -60,7 +60,7 @@
 		int32 size;			// size of sync
 		byte *ptr;			// pointer to sync
 	};
-	
+
 public:
 
 	struct soundStruct {