[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.13,1.14 dimuse.h,1.8,1.9

[Pawel Kolodziejski]

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

Modified Files:
	dimuse.cpp dimuse.h 
Log Message:
synced with local sources

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dimuse.cpp	8 Jan 2004 08:43:15 -0000	1.13
+++ dimuse.cpp	8 Jan 2004 17:07:21 -0000	1.14
@@ -208,6 +208,7 @@
 		int region = checkJumpByRegion(track, _track[track].curRegion);
 		if (region != -1)
 			_track[track].curRegion = region;
+		_track[track].curHookId = 0;
 	}
 
 	_track[track].regionOffset = 0;
@@ -320,7 +321,7 @@
 	}
 }
 
-void IMuseDigital::stopAllSounds() {
+void IMuseDigital::stopAllSounds(bool waitForStop) {
 	debug(5, "IMuseDigital::stopAllSounds");
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
 		if (_track[l].used) {
@@ -331,6 +332,17 @@
 		}
 	}
 	_curMusicId = -1;
+
+	if (waitForStop) {
+		bool used;
+		do {
+			used = false;
+			for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
+				if (_track[l].used)
+					used = true;
+			}
+		} while (used);
+	}
 }
 
 void IMuseDigital::pause(bool p) {
@@ -562,10 +574,6 @@
 	}
 
 	return 0;
-}
-
-void IMuseDigital::closeBundleFiles() {
-	// TODO
 }
 
 int32 IMuseDigital::getPosInMs(int soundId) {

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dimuse.h	8 Jan 2004 12:14:48 -0000	1.8
+++ dimuse.h	8 Jan 2004 17:07:21 -0000	1.9
@@ -101,7 +101,8 @@
 	void setMasterVolume(int vol) {}
 	void stopMusic();
 	void stopSound(int soundId);
-	void stopAllSounds();
+	void stopAllSounds(bool waitForStop);
+	void stopAllSounds() { stopAllSounds(false); }
 	void pause(bool pause);
 	void parseScriptCmds(int a, int b, int c, int d, int e, int f, int g, int h);
 	int getSoundStatus(int sound) const;
@@ -111,8 +112,6 @@
 	int32 getCurVoiceLipSyncHeight();
 	int32 getCurMusicLipSyncWidth(int32 param);
 	int32 getCurMusicLipSyncHeight(int32 param);
-
-	void closeBundleFiles();
 };
 
 struct imuse_music_table {