[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.79,1.80

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv17959

Modified Files:
	mixer.cpp 
Log Message:
return immediately after commiting suicide; enable new rate conversion code

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- mixer.cpp	29 Jul 2003 01:37:50 -0000	1.79
+++ mixer.cpp	29 Jul 2003 01:43:35 -0000	1.80
@@ -26,7 +26,7 @@
 #include "common/file.h"
 #include "common/util.h"
 
-//#define SOX_HACK
+#define SOX_HACK
 
 #ifdef SOX_HACK
 #include "rate.h"
@@ -726,6 +726,7 @@
 		// TODO: call drain method
 		// TODO: Looping
 		destroy();
+		return;
 	}
 
 	const int volume = _mixer->getVolume();
@@ -1183,6 +1184,7 @@
 	if (_input->eof() && !_is_cd_track) {
 		// TODO: call drain method
 		destroy();
+		return;
 	}
 
 	const int volume = _mixer->getVolume();