[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.102,1.103 dimuse.h,1.58,1.59 dimuse_script.cpp,1.11,1.12 dimuse_sndmgr.h,1.26,1.27 dimuse_track.cpp,1.25,1.26

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10352/scummvm/scumm/imuse_digi

Modified Files:
	dimuse.cpp dimuse.h dimuse_script.cpp dimuse_sndmgr.h 
	dimuse_track.cpp 
Log Message:
trackOffset is obsolote, added few debugs, added flush sounds while smush plying to prevent overload tracks

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- dimuse.cpp	19 Jun 2004 17:22:18 -0000	1.102
+++ dimuse.cpp	20 Jun 2004 15:28:10 -0000	1.103
@@ -106,7 +106,7 @@
 		MKLINE(Track, started, sleByte, VER(31)),
 		MKLINE(Track, priority, sleInt32, VER(31)),
 		MKLINE(Track, regionOffset, sleInt32, VER(31)),
-		MKLINE(Track, trackOffset, sleInt32, VER(31)),
+		MK_OBSOLETE(Track, trackOffset, sleInt32, VER(31), VER(31)),
 		MKLINE(Track, dataOffset, sleInt32, VER(31)),
 		MKLINE(Track, curRegion, sleInt32, VER(31)),
 		MKLINE(Track, curHookId, sleInt32, VER(31)),
@@ -125,6 +125,7 @@
 	ser->_load_ref = NULL;
 
 	ser->saveLoadEntries(this, mainEntries);
+
 	for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) {
 		Track *track = _track[l];
 		ser->saveLoadEntries(track, trackEntries);

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- dimuse.h	19 Jun 2004 16:00:11 -0000	1.58
+++ dimuse.h	20 Jun 2004 15:28:10 -0000	1.59
@@ -62,7 +62,6 @@
 		bool souStream;
 		int32 priority;
 		int32 regionOffset;
-		int32 trackOffset;
 		int32 dataOffset;
 		int32 curRegion;
 		int32 curHookId;

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dimuse_script.cpp	26 May 2004 17:03:31 -0000	1.11
+++ dimuse_script.cpp	20 Jun 2004 15:28:10 -0000	1.12
@@ -160,6 +160,7 @@
 }
 
 void IMuseDigital::flushTracks() {
+	debug(5, "flushTracks()");
 	for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) {
 		Track *track = _track[l];
 		if (track->used && track->readyToRemove) {
@@ -180,6 +181,7 @@
 }
 
 void IMuseDigital::refreshScripts() {
+	debug(5, "refreshScripts()");
 	bool found = false;
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
 		Track *track = _track[l];
@@ -189,6 +191,7 @@
 	}
 
 	if (!found && (_curMusicSeq != 0)) {
+		debug(5, "refreshScripts() Start Sequence");
 		parseScriptCmds(0x1001, 0, 0, 0, 0, 0, 0, 0);
 	}
 }

Index: dimuse_sndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dimuse_sndmgr.h	19 Jun 2004 17:48:06 -0000	1.26
+++ dimuse_sndmgr.h	20 Jun 2004 15:28:10 -0000	1.27
@@ -34,7 +34,7 @@
 class ImuseDigiSndMgr {
 public:
 
-#define MAX_IMUSE_SOUNDS 10
+#define MAX_IMUSE_SOUNDS 24
 
 #define IMUSE_RESOURCE 1
 #define IMUSE_BUNDLE 2