[Scummvm-cvs-logs] CVS: residual/imuse imuse_mcmp_mgr.cpp,1.7,1.8 imuse_sndmgr.cpp,1.5,1.6

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual/imuse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1145/imuse

Modified Files:
	imuse_mcmp_mgr.cpp imuse_sndmgr.cpp 
Log Message:
replace class instances into global refrences

Index: imuse_mcmp_mgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_mcmp_mgr.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- imuse_mcmp_mgr.cpp	31 Dec 2004 20:17:43 -0000	1.7
+++ imuse_mcmp_mgr.cpp	31 Dec 2004 21:35:04 -0000	1.8
@@ -37,25 +37,18 @@
 }
 
 McmpMgr::~McmpMgr() {
-	if (_file) {
-//		fclose(_file);
-	}
 	free(_compTable);
 	free(_compInput);
 }
 
 bool McmpMgr::openSound(const char *filename, byte **resPtr, int &offsetData) {
-	_file = ResourceLoader::instance()->openNewStream(filename);
+	_file = g_resourceloader->openNewStream(filename);
 
 	if (!_file) {
 		warning("McmpMgr::openFile() Can't open MCMP file: %s", filename);
 		return false;
 	}
 
-//	int filePos = ftell(_file);
-//	_file = fdopen(fileno(_file), "rb");
-//	fseek(_file, filePos, SEEK_SET);
-
 	uint32 tag;
 	fread(&tag, 1, 4, _file);
 	if (READ_BE_UINT32(&tag) != MKID_BE('MCMP')) {

Index: imuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_sndmgr.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imuse_sndmgr.cpp	31 Dec 2004 18:17:25 -0000	1.5
+++ imuse_sndmgr.cpp	31 Dec 2004 21:35:04 -0000	1.6
@@ -166,7 +166,7 @@
 	sound->volGroupId = volGroupId;
 
 	if (strcasecmp(extension, "imu") == 0) {
-		Block *b = ResourceLoader::instance()->getFileBlock(soundName);
+		Block *b = g_resourceloader->getFileBlock(soundName);
 		if (b != NULL) {
 			ptr = (byte *)b->data();
 			delete b;