[Scummvm-cvs-logs] SF.net SVN: scummvm: [27040] scummvm/trunk/engines/scumm/imuse_digi

[aquadran at users.sourceforge.net]

Revision: 27040
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27040&view=rev
Author:   aquadran
Date:     2007-06-01 04:41:07 -0700 (Fri, 01 Jun 2007)

Log Message:
-----------
rename some imuse variables

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp	2007-06-01 11:22:49 UTC (rev 27039)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp	2007-06-01 11:41:07 UTC (rev 27040)
@@ -36,7 +36,7 @@
 		_budleDirCache[fileId].bundleTable = NULL;
 		_budleDirCache[fileId].fileName[0] = 0;
 		_budleDirCache[fileId].numFiles = 0;
-		_budleDirCache[fileId].compressedBun = false;
+		_budleDirCache[fileId].isCompressed = false;
 		_budleDirCache[fileId].indexTable = NULL;
 	}
 }
@@ -61,7 +61,7 @@
 }
 
 bool BundleDirCache::isSndDataExtComp(int slot) {
-	return _budleDirCache[slot].compressedBun;
+	return _budleDirCache[slot].isCompressed;
 }
 
 int BundleDirCache::matchFile(const char *filename) {
@@ -93,7 +93,7 @@
 
 		tag = file.readUint32BE();
 		if (tag == MKID_BE('LB23'))
-			_budleDirCache[freeSlot].compressedBun = true;
+			_budleDirCache[freeSlot].isCompressed = true;
 		offset = file.readUint32BE();
 
 		strcpy(_budleDirCache[freeSlot].fileName, filename);
@@ -146,10 +146,10 @@
 	_compTable = NULL;
 	_numFiles = 0;
 	_numCompItems = 0;
-	_curSample = -1;
+	_curSampleId = -1;
 	_fileBundleId = -1;
 	_file = new ScummFile();
-	_compInput = NULL;
+	_compInputBuff = NULL;
 }
 
 BundleMgr::~BundleMgr() {
@@ -209,11 +209,11 @@
 		_compTableLoaded = false;
 		_lastBlock = -1;
 		_outputSize = 0;
-		_curSample = -1;
+		_curSampleId = -1;
 		free(_compTable);
 		_compTable = NULL;
-		free(_compInput);
-		_compInput = NULL;
+		free(_compInputBuff);
+		_compInputBuff = NULL;
 	}
 }
 
@@ -241,14 +241,14 @@
 			maxSize = _compTable[i].size;
 	}
 	// CMI hack: one more byte at the end of input buffer
-	_compInput = (byte *)malloc(maxSize + 1);
-	assert(_compInput);
+	_compInputBuff = (byte *)malloc(maxSize + 1);
+	assert(_compInputBuff);
 
 	return true;
 }
 
 int32 BundleMgr::decompressSampleByCurIndex(int32 offset, int32 size, byte **comp_final, int header_size, bool header_outside) {
-	return decompressSampleByIndex(_curSample, offset, size, comp_final, header_size, header_outside);
+	return decompressSampleByIndex(_curSampleId, offset, size, comp_final, header_size, header_outside);
 }
 
 int32 BundleMgr::decompressSampleByIndex(int32 index, int32 offset, int32 size, byte **comp_final, int header_size, bool header_outside) {
@@ -262,10 +262,10 @@
 		return 0;
 	}
 
-	if (_curSample == -1)
-		_curSample = index;
+	if (_curSampleId == -1)
+		_curSampleId = index;
 
-	assert(_curSample == index);
+	assert(_curSampleId == index);
 
 	if (!_compTableLoaded) {
 		_compTableLoaded = loadCompTable(index);
@@ -290,10 +290,10 @@
 	for (i = first_block; i <= last_block; i++) {
 		if (_lastBlock != i) {
 			// CMI hack: one more zero byte at the end of input buffer
-			_compInput[_compTable[i].size] = 0;
+			_compInputBuff[_compTable[i].size] = 0;
 			_file->seek(_bundleTable[index].offset + _compTable[i].offset, SEEK_SET);
-			_file->read(_compInput, _compTable[i].size);
-			_outputSize = BundleCodecs::decompressCodec(_compTable[i].codec, _compInput, _compOutput, _compTable[i].size);
+			_file->read(_compInputBuff, _compTable[i].size);
+			_outputSize = BundleCodecs::decompressCodec(_compTable[i].codec, _compInputBuff, _compOutputBuff, _compTable[i].size);
 			if (_outputSize > 0x2000) {
 				error("_outputSize: %d", _outputSize);
 			}
@@ -317,7 +317,7 @@
 
 		assert(final_size + output_size <= blocks_final_size);
 
-		memcpy(*comp_final + final_size, _compOutput + skip, output_size);
+		memcpy(*comp_final + final_size, _compOutputBuff + skip, output_size);
 		final_size += output_size;
 
 		size -= output_size;

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h	2007-06-01 11:22:49 UTC (rev 27039)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h	2007-06-01 11:41:07 UTC (rev 27040)
@@ -51,7 +51,7 @@
 		char fileName[20];
 		AudioTable *bundleTable;
 		int32 numFiles;
-		bool compressedBun;
+		bool isCompressed;
 		IndexNode *indexTable;
 	} _budleDirCache[4];
 
@@ -80,14 +80,15 @@
 	BundleDirCache::AudioTable *_bundleTable;
 	BundleDirCache::IndexNode *_indexTable;
 	CompTable *_compTable;
+
 	int _numFiles;
 	int _numCompItems;
-	int _curSample;
+	int _curSampleId;
 	BaseScummFile *_file;
 	bool _compTableLoaded;
 	int _fileBundleId;
-	byte _compOutput[0x2000];
-	byte *_compInput;
+	byte _compOutputBuff[0x2000];
+	byte *_compInputBuff;
 	int _outputSize;
 	int _lastBlock;
 


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