[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.17,1.18 mixer.cpp,1.18,1.19

[Max Horn]

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

Modified Files:
	mididrv.cpp mixer.cpp 
Log Message:
fix -Wshadow warnings

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mididrv.cpp	21 Oct 2002 16:55:26 -0000	1.17
+++ mididrv.cpp	23 Oct 2002 00:21:44 -0000	1.18
@@ -43,7 +43,7 @@
 	int open(int mode);
 	void close();
 	void send(uint32 b);
-	void pause(bool pause);
+	void pause(bool p);
 	void set_stream_callback(void *param, StreamCallback *sc);
 	void setPitchBendRange (byte channel, uint range) { }
 
@@ -247,10 +247,10 @@
 	check_error(midiOutShortMsg(_mo, u.dwData));
 }
 
-void MidiDriver_WIN::pause(bool pause)
+void MidiDriver_WIN::pause(bool p)
 {
 	if (_mode == MO_STREAMING) {
-		if (pause)
+		if (p)
 			check_error(midiStreamPause(_ms));
 		else
 			check_error(midiStreamRestart(_ms));
@@ -303,7 +303,7 @@
 	int open(int mode);
 	void close();
 	void send(uint32 b);
-	void pause(bool pause);
+	void pause(bool p);
 	void set_stream_callback(void *param, StreamCallback *sc);
 	void setPitchBendRange (byte channel, uint range) { }
 
@@ -473,10 +473,10 @@
 	}
 }
 
-void MidiDriver_ETUDE::pause(bool pause)
+void MidiDriver_ETUDE::pause(bool p)
 {
 	if (_mode == MO_STREAMING && ScummMidiRequest) {
-		if (pause)
+		if (p)
 			PauseMidiStream(ScummMidiRequest);
 		else
 			RestartMidiStream(ScummMidiRequest);
@@ -515,7 +515,7 @@
 	int open(int mode);
 	void close();
 	void send(uint32 b);
-	void pause(bool pause);
+	void pause(bool p);
 	void set_stream_callback(void *param, StreamCallback *sc);
 	void setPitchBendRange (byte channel, uint range) { }
 
@@ -613,7 +613,7 @@
 	write(device, buf, position);
 }
 
-void MidiDriver_SEQ::pause(bool pause)
+void MidiDriver_SEQ::pause(bool p)
 {
 	if (_mode == MO_STREAMING) {
 	}
@@ -653,7 +653,7 @@
 	int open(int mode);
 	void close();
 	void send(uint32 b);
-	void pause(bool pause) { }
+	void pause(bool p) { }
 	void set_stream_callback(void *param, StreamCallback *sc);
 	void setPitchBendRange (byte channel, uint range);
 
@@ -862,7 +862,7 @@
 	} int open(int mode);
 	void close();
 	void send(uint32 b);
-	void pause(bool pause);
+	void pause(bool p);
 	void set_stream_callback(void *param, StreamCallback *sc);
 	void setPitchBendRange (byte channel, uint range) { }
 
@@ -985,7 +985,7 @@
 	int open(int mode);
 	void close() { }
 	void send(uint32 b) { }
-	void pause(bool pause) { }
+	void pause(bool p) { }
 	void set_stream_callback(void *param, StreamCallback *sc) { }
 	void setPitchBendRange (byte channel, uint range) { }
 private:
@@ -1058,7 +1058,7 @@
 	int open(int mode);
 	void close();
 	void send(uint32 b);
-	void pause(bool pause);
+	void pause(bool p);
 	void set_stream_callback(void *param, StreamCallback *sc);
 	void setPitchBendRange (byte channel, uint range) { }
 
@@ -1228,7 +1228,7 @@
 	}
 }
 
-void MidiDriver_ALSA::pause(bool pause)
+void MidiDriver_ALSA::pause(bool p)
 {
 	if (_mode == MO_STREAMING) {
 		/* Err... and what? */

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mixer.cpp	16 Oct 2002 00:24:45 -0000	1.18
+++ mixer.cpp	23 Oct 2002 00:21:44 -0000	1.19
@@ -293,7 +293,7 @@
 	int a, b, c, d;
 	
 public:
-	CubicInterpolator(int a, int b, int c) : x0(2 * a - b), x1(a), x2(b), x3(c)
+	CubicInterpolator(int a0, int b0, int c0) : x0(2 * a0 - b0), x1(a0), x2(b0), x3(c0)
 	{
 		// We use a simple linear interpolation for x0
 		updateCoefficients();