[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.10,1.11

Max Horn fingolfin at users.sourceforge.net
Wed Jan 7 18:00:01 CET 2004


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

Modified Files:
	dimuse.cpp 
Log Message:
fix a memory leak; re-add assert, just to be sure

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dimuse.cpp	7 Jan 2004 20:17:51 -0000	1.10
+++ dimuse.cpp	8 Jan 2004 01:59:11 -0000	1.11
@@ -175,6 +175,7 @@
 							break;
 					}
 					mixer_size -= result;
+					assert(mixer_size >= 0);
 				} while (mixer_size != 0);
 			}
 		}
@@ -278,7 +279,7 @@
 			} else {
 				_track[l].stream2 = NULL;
 				_track[l].stream = makeAppendableAudioStream(freq, mixerFlags, 100000);
-				_scumm->_mixer->playInputStream(&_track[l].handle, _track[l].stream, true, _track[l].vol / 1000, _track[l].pan, -1, false);
+				_scumm->_mixer->playInputStream(&_track[l].handle, _track[l].stream, true, _track[l].vol / 1000, _track[l].pan, -1);
 			}
 
 			_track[l].used = true;





More information about the Scummvm-git-logs mailing list