diff options
author | Max Horn | 2002-10-23 00:24:43 +0000 |
---|---|---|
committer | Max Horn | 2002-10-23 00:24:43 +0000 |
commit | ab13e67b0907fdb97b0dde3bb3344650d4d12946 (patch) | |
tree | 4ad06cfef44c96d7055f0beeb69c0ec424ea9d46 /sound/mididrv.cpp | |
parent | df2bf812c3a40ce104f7ccd3a240e6f8d3303aa8 (diff) | |
download | scummvm-rg350-ab13e67b0907fdb97b0dde3bb3344650d4d12946.tar.gz scummvm-rg350-ab13e67b0907fdb97b0dde3bb3344650d4d12946.tar.bz2 scummvm-rg350-ab13e67b0907fdb97b0dde3bb3344650d4d12946.zip |
fix -Wshadow warnings
svn-id: r5270
Diffstat (limited to 'sound/mididrv.cpp')
-rw-r--r-- | sound/mididrv.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 5733d7f546..f330b0acff 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -43,7 +43,7 @@ public: 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 @@ void MidiDriver_WIN::send(uint32 b) 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 @@ public: 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::fill_all() } } -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 @@ public: 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 @@ void MidiDriver_SEQ::send(uint32 b) write(device, buf, position); } -void MidiDriver_SEQ::pause(bool pause) +void MidiDriver_SEQ::pause(bool p) { if (_mode == MO_STREAMING) { } @@ -653,7 +653,7 @@ public: 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 @@ public: } 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 @@ public: 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 @@ public: 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::send(uint32 b) } } -void MidiDriver_ALSA::pause(bool pause) +void MidiDriver_ALSA::pause(bool p) { if (_mode == MO_STREAMING) { /* Err... and what? */ |