[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_bndmgr.cpp,1.30,1.31 dimuse_bndmgr.h,1.14,1.15 dimuse_sndmgr.cpp,1.69,1.70 dimuse_sndmgr.h,1.31,1.32

[Max Horn]

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

Modified Files:
	dimuse_bndmgr.cpp dimuse_bndmgr.h dimuse_sndmgr.cpp 
	dimuse_sndmgr.h 
Log Message:
Moved class File and the MD5 stuff to namespace Common

Index: dimuse_bndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- dimuse_bndmgr.cpp	10 Apr 2005 12:59:17 -0000	1.30
+++ dimuse_bndmgr.cpp	10 May 2005 22:56:14 -0000	1.31
@@ -71,7 +71,7 @@
 	}
 
 	if (!found) {
-		File file;
+		Common::File file;
 
 		if (file.open(filename) == false) {
 			warning("BundleDirCache::matchFile() Can't open bundle file: %s", filename);
@@ -135,7 +135,7 @@
 	close();
 }
 
-File *BundleMgr::getFile(const char *filename, int32 &offset, int32 &size) {
+Common::File *BundleMgr::getFile(const char *filename, int32 &offset, int32 &size) {
 	for (int i = 0; i < _numFiles; i++) {
 		if (!scumm_stricmp(filename, _bundleTable[i].filename)) {
 			_file.seek(_bundleTable[i].offset, SEEK_SET);

Index: dimuse_bndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dimuse_bndmgr.h	25 Jan 2005 22:21:09 -0000	1.14
+++ dimuse_bndmgr.h	10 May 2005 22:56:14 -0000	1.15
@@ -67,7 +67,7 @@
 	int _numFiles;
 	int _numCompItems;
 	int _curSample;
-	File _file;
+	Common::File _file;
 	bool _compTableLoaded;
 	int _fileBundleId;
 	byte _compOutput[0x2000];
@@ -84,7 +84,7 @@
 
 	bool open(const char *filename, bool &compressed);
 	void close();
-	File *getFile(const char *filename, int32 &offset, int32 &size);
+	Common::File *getFile(const char *filename, int32 &offset, int32 &size);
 	int32 decompressSampleByName(const char *name, int32 offset, int32 size, byte **comp_final, bool header_outside);
 	int32 decompressSampleByIndex(int32 index, int32 offset, int32 size, byte **comp_final, int header_size, bool header_outside);
 	int32 decompressSampleByCurIndex(int32 offset, int32 size, byte **comp_final, int header_size, bool header_outside);

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- dimuse_sndmgr.cpp	10 Apr 2005 12:59:17 -0000	1.69
+++ dimuse_sndmgr.cpp	10 May 2005 22:56:15 -0000	1.70
@@ -84,7 +84,7 @@
 	} while (tag != MKID_BE('DATA'));
 }
 
-void ImuseDigiSndMgr::prepareSoundFromRMAP(File *file, soundStruct *sound, int32 offset, int32 size) {
+void ImuseDigiSndMgr::prepareSoundFromRMAP(Common::File *file, soundStruct *sound, int32 offset, int32 size) {
 	int l;
 
 	file->seek(offset, SEEK_SET);
@@ -368,7 +368,7 @@
 			char fileName[24];
 			int32 offset = 0, size = 0;
 			sprintf(fileName, "%s.map", soundName);
-			File *rmapFile = sound->bundle->getFile(fileName, offset, size);
+			Common::File *rmapFile = sound->bundle->getFile(fileName, offset, size);
 			if (!rmapFile) {
 				closeSound(sound);
 				return NULL;
@@ -577,7 +577,7 @@
 		sprintf(fileName, "%s_reg%03d", soundHandle->name, region);
 		if (scumm_stricmp(fileName, soundHandle->lastFileName) != 0) {
 			int32 offs = 0, len = 0;
-			File *cmpFile;
+			Common::File *cmpFile;
 			bool oggMode = false;
 			sprintf(fileName, "%s_reg%03d.mp3", soundHandle->name, region);
 			cmpFile = soundHandle->bundle->getFile(fileName, offs, len);

Index: dimuse_sndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- dimuse_sndmgr.h	25 Jan 2005 22:21:23 -0000	1.31
+++ dimuse_sndmgr.h	10 May 2005 22:56:15 -0000	1.32
@@ -96,7 +96,7 @@
 	bool checkForProperHandle(soundStruct *soundHandle);
 	soundStruct *allocSlot();
 	void prepareSound(byte *ptr, soundStruct *sound);
-	void prepareSoundFromRMAP(File *file, soundStruct *sound, int32 offset, int32 size);
+	void prepareSoundFromRMAP(Common::File *file, soundStruct *sound, int32 offset, int32 size);
 
 	ScummEngine *_vm;
 	byte _disk;