[Scummvm-cvs-logs] CVS: residual/imuse imuse.cpp,1.10,1.11 imuse.h,1.8,1.9 imuse_track.cpp,1.8,1.9

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jan 2 11:09:15 CET 2005


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

Modified Files:
	imuse.cpp imuse.h imuse_track.cpp 
Log Message:
fix handle sfx sound costume component

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- imuse.cpp	1 Jan 2005 12:27:57 -0000	1.10
+++ imuse.cpp	2 Jan 2005 19:08:44 -0000	1.11
@@ -236,6 +236,9 @@
 				fadeTrack->regionOffset = 0;
 			}
 			track->curRegion = region;
+			if (track->curHookId == 0x80) {
+				track->curHookId = 0;
+			}
 		}
 	}
 

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imuse.h	1 Jan 2005 21:07:52 -0000	1.8
+++ imuse.h	2 Jan 2005 19:08:44 -0000	1.9
@@ -133,6 +133,7 @@
 	int getVolume(const char *soundName);
 	void setPan(const char *soundName, int pan);
 	void setFade(const char *soundName, int destVolume, int delay60HzTicks);
+	void setHookId(const char *soundName, int hookId);
 	int getCountPlayedTracks();
 	void stopSound(const char *soundName);
 	void stopAllSounds();

Index: imuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_track.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imuse_track.cpp	1 Jan 2005 12:27:57 -0000	1.8
+++ imuse_track.cpp	2 Jan 2005 19:08:44 -0000	1.9
@@ -186,6 +186,17 @@
 	return 0;
 }
 
+void Imuse::setHookId(const char *soundName, int hookId) {
+	StackLock lock(_mutex);
+
+	for (int l = 0; l < MAX_IMUSE_TRACKS; l++) {
+		Track *track = _track[l];
+		if (track->used && !track->toBeRemoved && (strcmp(track->soundName, soundName) == 0)) {
+			track->curHookId = hookId;
+		}
+	}
+}
+
 int Imuse::getCountPlayedTracks() {
 	int count = 0;
 	for (int l = 0; l < MAX_IMUSE_TRACKS; l++) {





More information about the Scummvm-git-logs mailing list