[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.88,1.89 dimuse_script.cpp,1.7,1.8

[Pawel Kolodziejski]

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

Modified Files:
	dimuse.cpp dimuse_script.cpp 
Log Message:
- fix for cuting voices in comi,
- fix for lipsync stuff (compromise append buffer ahead to sync position)

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- dimuse.cpp	2 May 2004 14:03:21 -0000	1.88
+++ dimuse.cpp	2 May 2004 16:46:51 -0000	1.89
@@ -237,12 +237,12 @@
 				int bits = _sound->getBits(_track[l]->soundHandle);
 				int channels = _sound->getChannels(_track[l]->soundHandle);
 
-				int32 freeSpace = _track[l]->stream->getFreeSpace() - 4;
-				int32 bufferMin = (_track[l]->iteration * 3) / 4;
-				if (bufferMin > freeSpace)
+				int32 bufferUsage = _track[l]->iteration - _track[l]->stream->getFreeSpace() - 4;
+				int32 bufferMin = (_track[l]->iteration * 1) / 10;
+				if (bufferMin < bufferUsage)
 					continue;
 
-				int32 mixer_size = freeSpace;
+				int32 mixer_size = bufferMin - bufferUsage;
 
 				if ((bits == 12) || (bits == 16)) {
 					if (channels == 1)

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dimuse_script.cpp	26 Apr 2004 07:47:12 -0000	1.7
+++ dimuse_script.cpp	2 May 2004 16:46:51 -0000	1.8
@@ -244,7 +244,7 @@
 	Common::StackLock lock(_mutex, "IMuseDigital::getSoundStatus()");
 	debug(5, "IMuseDigital::getSoundStatus(%d)", sound);
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
-		if ((_track[l]->soundId == sound) && _track[l]->used) {
+		if ((_track[l]->soundId == sound) && _track[l]->handle.isActive()) {
 			return 1;
 		}
 	}