[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.149,1.150

Max Horn fingolfin at users.sourceforge.net
Sat Dec 27 13:40:07 CET 2003


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

Modified Files:
	mixer.cpp 
Log Message:
paranoia

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- mixer.cpp	26 Dec 2003 02:19:31 -0000	1.149
+++ mixer.cpp	27 Dec 2003 21:31:41 -0000	1.150
@@ -127,9 +127,7 @@
 
 SoundMixer::~SoundMixer() {
 	_syst->clear_sound_proc();
-	for (int i = 0; i != NUM_CHANNELS; i++) {
-		delete _channels[i];
-	}
+	stopAll();
 	_syst->delete_mutex(_mutex);
 }
 
@@ -164,7 +162,7 @@
 	chan = (ChannelStream*)_channels[index];
 #endif
 	if (!chan) {
-		error("Trying to append to nonexistant streamer : %d", index);
+		error("Trying to append to nonexistant stream : %d", index);
 	} else {
 		chan->append(sound, size);
 	}





More information about the Scummvm-git-logs mailing list