[Scummvm-cvs-logs] CVS: residual/imuse imuse.cpp,1.6,1.7 imuse.h,1.4,1.5 imuse_script.cpp,1.4,1.5 imuse_track.cpp,1.5,1.6

[Pawel Kolodziejski]

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

Modified Files:
	imuse.cpp imuse.h imuse_script.cpp imuse_track.cpp 
Log Message:
cleanup

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imuse.cpp	29 Dec 2004 06:32:07 -0000	1.6
+++ imuse.cpp	31 Dec 2004 22:05:26 -0000	1.7
@@ -26,9 +26,7 @@
 #include "imuse.h"
 #include "imuse_sndmgr.h"
 
-extern SoundMixer *g_mixer;
-
-Imuse *g_imuse;
+Imuse *g_imuse = NULL;
 
 Imuse::Track::Track()
 	: used(false), stream(NULL) {

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imuse.h	30 Dec 2004 22:38:53 -0000	1.4
+++ imuse.h	31 Dec 2004 22:05:26 -0000	1.5
@@ -147,4 +147,6 @@
 	int32 getCurMusicPosInMs();
 };
 
+extern Imuse *g_imuse;
+
 #endif

Index: imuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_script.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imuse_script.cpp	30 Dec 2004 22:43:06 -0000	1.4
+++ imuse_script.cpp	31 Dec 2004 22:05:26 -0000	1.5
@@ -26,8 +26,6 @@
 #include "imuse.h"
 #include "imuse_sndmgr.h"
 
-extern SoundMixer *g_mixer;
-
 void Imuse::flushTracks() {
 	for (int l = 0; l < MAX_IMUSE_TRACKS + MAX_IMUSE_FADETRACKS; l++) {
 		Track *track = _track[l];

Index: imuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_track.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imuse_track.cpp	30 Dec 2004 22:38:53 -0000	1.5
+++ imuse_track.cpp	31 Dec 2004 22:05:26 -0000	1.6
@@ -25,9 +25,6 @@
 #include "imuse.h"
 #include "imuse_sndmgr.h"
 
-extern SoundMixer *g_mixer;
-
-
 int Imuse::allocSlot(int priority) {
 	int l, lowest_priority = 127;
 	int trackId = -1;
@@ -185,6 +182,8 @@
 			return track->vol / 1000;
 		}
 	}
+
+	return 0;
 }
 
 int Imuse::getCountPlayedTracks() {