[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.79,1.80 dimuse_sndmgr.cpp,1.40,1.41 dimuse_track.cpp,1.13,1.14

[Pawel Kolodziejski]

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

Modified Files:
	dimuse.cpp dimuse_sndmgr.cpp dimuse_track.cpp 
Log Message:
cleanup

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- dimuse.cpp	26 Apr 2004 21:29:49 -0000	1.79
+++ dimuse.cpp	28 Apr 2004 05:39:52 -0000	1.80
@@ -165,10 +165,13 @@
 				int bits = _sound->getBits(_track[l]->soundHandle);
 				int channels = _sound->getChannels(_track[l]->soundHandle);
 
-				int32 mixer_size = _track[l]->stream->getFreeSpace() - 4;
-				if ((_track[l]->iteration / 2) > mixer_size)
+				int32 freeSpace = _track[l]->stream->getFreeSpace() - 4;
+				int32 bufferMin = (_track[l]->iteration * 3) / 4;
+				if (bufferMin > freeSpace)
 					continue;
 
+				int32 mixer_size = freeSpace;
+
 				if ((bits == 12) || (bits == 16)) {
 					if (channels == 1)
 						mixer_size &= ~1;

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- dimuse_sndmgr.cpp	27 Apr 2004 09:53:44 -0000	1.40
+++ dimuse_sndmgr.cpp	28 Apr 2004 05:39:53 -0000	1.41
@@ -85,7 +85,6 @@
 		int len;
 
 		int32 offset = READ_LE_UINT16(ptr + 20);
-		/* int16 version = */ READ_LE_UINT16(ptr + 22);
 		int16 code = READ_LE_UINT16(ptr + 24);
 
 		_sounds[slot].region = (_region *)malloc(sizeof(_region) * 70);

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dimuse_track.cpp	27 Apr 2004 17:31:28 -0000	1.13
+++ dimuse_track.cpp	28 Apr 2004 05:39:53 -0000	1.14
@@ -43,7 +43,7 @@
 	}
 
 	if (!found_free) {
-		warning("IMuseDigital::startSound(): All slots are full");
+		debug(5, "IMuseDigital::startSound(): All slots are full");
 		for (l = 0; l < MAX_DIGITAL_TRACKS; l++) {
 			if (_track[l]->used && _track[l]->handle.isActive() &&
 					(lower_priority > _track[l]->priority) && (!_track[l]->stream2))
@@ -65,9 +65,9 @@
 			_track[track_id]->soundHandle = NULL;
 			_track[track_id]->used = false;
 			assert(!_track[track_id]->handle.isActive());
-			warning("IMuseDigital::startSound(): Removed sound %d from track %d", _track[track_id]->soundId, track_id);
+			debug(5, "IMuseDigital::startSound(): Removed sound %d from track %d", _track[track_id]->soundId, track_id);
 		} else {
-			warning("IMuseDigital::startSound(): Priority sound too low");
+			debug(5, "IMuseDigital::startSound(): Priority sound too low");
 			return false;
 		}
 	}