[Scummvm-cvs-logs] CVS: residual/imuse imuse.h,1.15,1.16 imuse_track.cpp,1.11,1.12

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Jan 15 16:28:06 CET 2005


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

Modified Files:
	imuse.h imuse_track.cpp 
Log Message:
fixed bug related checking all sounds instead for concrete sound

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- imuse.h	14 Jan 2005 09:25:42 -0000	1.15
+++ imuse.h	16 Jan 2005 00:27:19 -0000	1.16
@@ -141,7 +141,7 @@
 	void setFadePan(const char *soundName, int destPan, int duration);
 	void setFadeVolume(const char *soundName, int destVolume, int duration);
 	void setHookId(const char *soundName, int hookId);
-	int getCountPlayedTracks();
+	int getCountPlayedTracks(const char *soundName);
 	void stopSound(const char *soundName);
 	void stopAllSounds();
 	void pause(bool pause);

Index: imuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_track.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- imuse_track.cpp	14 Jan 2005 09:17:29 -0000	1.11
+++ imuse_track.cpp	16 Jan 2005 00:27:19 -0000	1.12
@@ -193,11 +193,11 @@
 	}
 }
 
-int Imuse::getCountPlayedTracks() {
+int Imuse::getCountPlayedTracks(const char *soundName) {
 	int count = 0;
 	for (int l = 0; l < MAX_IMUSE_TRACKS; l++) {
 		Track *track = _track[l];
-		if (track->used && !track->toBeRemoved) {
+		if (track->used && !track->toBeRemoved && (strcmp(track->soundName, soundName) == 0)) {
 			count++;
 		}
 	}





More information about the Scummvm-git-logs mailing list