[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.38,1.39 mixer.h,1.23,1.24

Max Horn fingolfin at users.sourceforge.net
Sun Aug 18 10:49:03 CEST 2002


Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv19809/sound

Modified Files:
	mididrv.cpp mixer.h 
Log Message:
MAJOR change to the way how Engine objects are instantiated

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- mididrv.cpp	7 Jul 2002 18:04:02 -0000	1.38
+++ mididrv.cpp	18 Aug 2002 17:48:18 -0000	1.39
@@ -1118,7 +1118,7 @@
 			unsigned char note = (unsigned char)((b >> 8) & 0x7F);
 			unsigned char vel = (unsigned char)((b >> 16) & 0x7F);
 			int i, j;
-			int onl, on, nv;
+			int onl, on, nv = 0;
 			unsigned char ins[11];
 			on = -1;
 			if (ch[channel].on != 0) {
@@ -1306,7 +1306,7 @@
 	bool need_midi_data = true;
 
 	for (;;) {
-		int number;
+		int number = 0;
 		int i;
 
 		if (need_midi_data) {

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mixer.h	18 Aug 2002 16:10:38 -0000	1.23
+++ mixer.h	18 Aug 2002 17:48:18 -0000	1.24
@@ -23,6 +23,7 @@
 #ifndef MIXER_H
 #define MIXER_H
 
+#include <stdio.h>
 #ifdef COMPRESSED_SOUND_FILE
 #include <mad.h>
 #endif





More information about the Scummvm-git-logs mailing list