[Scummvm-cvs-logs] CVS: scummvm/scumm music.h,2.1,2.2 imuse_digi.cpp,1.41,1.42 imuse_digi.h,1.10,1.11

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2386

Modified Files:
	music.h imuse_digi.cpp imuse_digi.h 
Log Message:
small tweak (hm, is IMuse::get_sound_active really still needed? or rather, does IMuse::getSoundStatus really have to return an int or can we cast it to boolean safely?)

Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/music.h,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- music.h	7 Sep 2003 16:16:19 -0000	2.1
+++ music.h	7 Sep 2003 16:28:41 -0000	2.2
@@ -33,7 +33,7 @@
 	virtual void startSound(int sound) = 0;
 	virtual void stopSound(int sound) = 0;
 //	virtual void stopAllSounds() = 0;
-//	virtual int getSoundStatus(int sound) = 0;
+//	virtual bool getSoundStatus(int sound) const = 0;
 };
 
 #endif

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- imuse_digi.cpp	6 Sep 2003 10:47:30 -0000	1.41
+++ imuse_digi.cpp	7 Sep 2003 16:28:41 -0000	1.42
@@ -1164,15 +1164,15 @@
 	}
 }
 
-int IMuseDigital::getSoundStatus(int sound) {
+bool IMuseDigital::getSoundStatus(int sound) {
 	debug(5, "IMuseDigital::getSoundStatus(%d)", sound);
 	for (int l = 0; l < MAX_DIGITAL_CHANNELS; l++) {
 		if ((_channel[l]._idSound == sound) && _channel[l]._used) {
-			return 1;
+			return true;
 		}
 	}
 
-	return 0;
+	return false;
 }
 
 

Index: imuse_digi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- imuse_digi.h	7 Sep 2003 16:16:19 -0000	1.10
+++ imuse_digi.h	7 Sep 2003 16:28:41 -0000	1.11
@@ -72,7 +72,7 @@
 	void stopAll();
 	void pause(bool pause);
 	int32 doCommand(int a, int b, int c, int d, int e, int f, int g, int h);
-	int getSoundStatus(int sound);
+	bool getSoundStatus(int sound);
 };
 
 #endif