[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.48,1.49

Max Horn fingolfin at users.sourceforge.net
Sun Jun 22 06:49:04 CEST 2003


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

Modified Files:
	mixer.cpp 
Log Message:
properly init member vars instead of using memset

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- mixer.cpp	22 Jun 2003 11:46:58 -0000	1.48
+++ mixer.cpp	22 Jun 2003 13:48:47 -0000	1.49
@@ -155,12 +155,24 @@
 
 
 SoundMixer::SoundMixer() {
-	memset(this,0,sizeof(SoundMixer)); // palmos
+	_syst = 0;
+	_mutex = 0;
+
+	_premixParam = 0;
+	_premixProc = 0;
+
+	for (int i = 0; i != NUM_CHANNELS; i++)
+		_handles[i] = NULL;
+	
+	_outputRate = 0;
 
 	_volumeTable = (int16 *)calloc(256 * sizeof(int16), 1);
-	for (int i = 0; i != NUM_CHANNELS; i++) {
+	_musicVolume = 0;
+
+	_paused = false;
+
+	for (int i = 0; i != NUM_CHANNELS; i++)
 		_channels[i] = NULL;
-	}
 }
 
 SoundMixer::~SoundMixer() {





More information about the Scummvm-git-logs mailing list