[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.243,1.244

Max Horn fingolfin at users.sourceforge.net
Mon Sep 8 21:34:02 CEST 2003


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

Modified Files:
	sound.cpp 
Log Message:
fix for bug #802396 (LOOMCD: Sound often causes lock up)

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- sound.cpp	8 Sep 2003 07:07:30 -0000	1.243
+++ sound.cpp	8 Sep 2003 11:41:28 -0000	1.244
@@ -1522,10 +1522,6 @@
 	if (_dig_cd.playing) {
 		_scumm->_mixer->stopHandle(_dig_cd.handle);
 		_dig_cd.playing = false;
-		_dig_cd.track = 0;
-		_dig_cd.numLoops = 0;
-		_dig_cd.start = 0;
-		_dig_cd.duration = 0;
 	} else {
 		_scumm->_system->stop_cdrom();
 	}
@@ -1544,8 +1540,10 @@
 			// the CD explicitly
 			if (_dig_cd.numLoops == -1 || --_dig_cd.numLoops > 0)
 				playCDTrack(_dig_cd.track, _dig_cd.numLoops, _dig_cd.start, _dig_cd.duration);
-			else
-				stopCD();
+			else {
+				_scumm->_mixer->stopHandle(_dig_cd.handle);
+				_dig_cd.playing = false;
+			}
 		}
 	} else {
 		_scumm->_system->update_cdrom();





More information about the Scummvm-git-logs mailing list