[Scummvm-cvs-logs] CVS: residual/imuse imuse.cpp,1.7,1.8 imuse_mcmp_mgr.cpp,1.9,1.10

[Pawel Kolodziejski]

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

Modified Files:
	imuse.cpp imuse_mcmp_mgr.cpp 
Log Message:
cleanup

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- imuse.cpp	31 Dec 2004 22:05:26 -0000	1.7
+++ imuse.cpp	1 Jan 2005 10:12:15 -0000	1.8
@@ -19,6 +19,7 @@
 #include "../bits.h"
 #include "../debug.h"
 #include "../timer.h"
+#include "../engine.h"
 
 #include "../mixer/mixer.h"
 #include "../mixer/audiostream.h"
@@ -28,6 +29,12 @@
 
 Imuse *g_imuse = NULL;
 
+extern uint16 imuseDestTable[];
+extern ImuseTable grimStateMusicTable[];
+extern ImuseTable grimSeqMusicTable[];
+extern ImuseTable grimDemoStateMusicTable[];
+extern ImuseTable grimDemoSeqMusicTable[];
+
 Imuse::Track::Track()
 	: used(false), stream(NULL) {
 }
@@ -37,13 +44,6 @@
 	imuse->callback();
 }
 
-extern void vimaInit(uint16 *destTable);
-extern uint16 imuseDestTable[5786];
-extern ImuseTable grimStateMusicTable[];
-extern ImuseTable grimSeqMusicTable[];
-extern ImuseTable grimDemoStateMusicTable[];
-extern ImuseTable grimDemoSeqMusicTable[];
-
 Imuse::Imuse(int fps) {
 	_mutex = createMutex();
 	_pause = false;

Index: imuse_mcmp_mgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_mcmp_mgr.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- imuse_mcmp_mgr.cpp	1 Jan 2005 09:57:33 -0000	1.9
+++ imuse_mcmp_mgr.cpp	1 Jan 2005 10:12:16 -0000	1.10
@@ -19,11 +19,11 @@
 #include "../bits.h"
 #include "../debug.h"
 #include "../resource.h"
+#include "../engine.h"
 
 #include "imuse_mcmp_mgr.h"
 
 uint16 imuseDestTable[5786];
-void decompressVima(const byte *src, int16 *dest, int destLen, uint16 *destTable);
 
 McmpMgr::McmpMgr() {
 	_compTable = NULL;
@@ -49,7 +49,7 @@
 	_file = g_resourceloader->openNewStream(filename);
 
 	if (!_file) {
-		warning("McmpMgr::openFile() Can't open MCMP file: %s", filename);
+		warning("McmpMgr::openSound() Can't open sound MCMP file: %s", filename);
 		return false;
 	}
 
@@ -104,7 +104,7 @@
 	int skip, first_block, last_block;
 
 	if (!_file) {
-		warning("McmpMgr::decompressSampleByName() File is not open!");
+		error("McmpMgr::decompressSampleByName() File is not open!");
 		return 0;
 	}
 
@@ -127,7 +127,7 @@
 			decompressVima(_compInput, (int16 *)_compOutput, _compTable[i].decompSize, imuseDestTable);
 			_outputSize = _compTable[i].decompSize;
 			if (_outputSize > 0x2000) {
-				error("_outputSize: %d", _outputSize);
+				error("McmpMgr::decompressSample() _outputSize: %d", _outputSize);
 			}
 			_lastBlock = i;
 		}