[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.30,1.31

Max Horn fingolfin at users.sourceforge.net
Fri May 17 10:42:02 CEST 2002


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

Modified Files:
	mididrv.cpp 
Log Message:
fixed shadow var warnings

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- mididrv.cpp	16 May 2002 19:04:38 -0000	1.30
+++ mididrv.cpp	17 May 2002 17:41:07 -0000	1.31
@@ -498,6 +498,8 @@
 
 int MidiDriver_QT::open(int mode) {
 	ComponentResult qtErr = noErr;
+	int i;
+
 	qtNoteAllocator = NULL;
 
 	if (mode == MO_STREAMING)
@@ -505,7 +507,7 @@
 
 	_mode = mode;
 
-	for (int i = 0; i < 15; i++)
+	for (i = 0; i < 15; i++)
 		qtNoteChannel[i] = NULL;
 
 	qtNoteAllocator = OpenDefaultComponent(kNoteAllocatorComponentType, 0);
@@ -521,7 +523,7 @@
 	if (qtErr != noErr)
 		goto bail;
 
-	for (int i = 0; i < 15; i++) {
+	for (i = 0; i < 15; i++) {
 		qtErr =
 			NANewNoteChannel(qtNoteAllocator, &simpleNoteRequest,
 											 &(qtNoteChannel[i]));
@@ -533,7 +535,7 @@
 bail:
 	error("Init QT failed %x %x %d\n", (int)qtNoteAllocator, (int)qtNoteChannel,
 					(int)qtErr);
-	for (int i = 0; i < 15; i++) {
+	for (i = 0; i < 15; i++) {
 		if (qtNoteChannel[i] != NULL)
 			NADisposeNoteChannel(qtNoteAllocator, qtNoteChannel[i]);
 		qtNoteChannel[i] = NULL;
@@ -646,7 +648,7 @@
 	}
 }
 
-void MidiDriver_QT::pause(bool pause) {
+void MidiDriver_QT::pause(bool) {
 }
 
 MidiDriver *MidiDriver_QT_create() {
@@ -750,7 +752,7 @@
 	MusicDeviceMIDIEvent(au_MusicDevice, status_byte, first_byte, seccond_byte, 0);
 }
 
-void MidiDriver_CORE::pause(bool pause) {
+void MidiDriver_CORE::pause(bool) {
 }
 
 MidiDriver *MidiDriver_CORE_create() {





More information about the Scummvm-git-logs mailing list