aboutsummaryrefslogtreecommitdiff
path: root/sound/mididrv.cpp
diff options
context:
space:
mode:
authorMax Horn2002-05-17 17:41:07 +0000
committerMax Horn2002-05-17 17:41:07 +0000
commit9c01a88e90b45c97c3a8b2b86f20a8f7c93f09a0 (patch)
tree3eb6c56a3568dd92a03969e62c23d6c4f294f880 /sound/mididrv.cpp
parent9236c4f90577615afd5158d0c09055f7ae883ea5 (diff)
downloadscummvm-rg350-9c01a88e90b45c97c3a8b2b86f20a8f7c93f09a0.tar.gz
scummvm-rg350-9c01a88e90b45c97c3a8b2b86f20a8f7c93f09a0.tar.bz2
scummvm-rg350-9c01a88e90b45c97c3a8b2b86f20a8f7c93f09a0.zip
fixed shadow var warnings
svn-id: r4345
Diffstat (limited to 'sound/mididrv.cpp')
-rw-r--r--sound/mididrv.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp
index fd25a4ab84..e4155f0d25 100644
--- a/sound/mididrv.cpp
+++ b/sound/mididrv.cpp
@@ -498,6 +498,8 @@ void MidiDriver_QT::set_stream_callback(void *param, StreamCallback *sc) {
int MidiDriver_QT::open(int mode) {
ComponentResult qtErr = noErr;
+ int i;
+
qtNoteAllocator = NULL;
if (mode == MO_STREAMING)
@@ -505,7 +507,7 @@ int MidiDriver_QT::open(int mode) {
_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 @@ int MidiDriver_QT::open(int mode) {
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 @@ int MidiDriver_QT::open(int mode) {
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::send(uint32 b) {
}
}
-void MidiDriver_QT::pause(bool pause) {
+void MidiDriver_QT::pause(bool) {
}
MidiDriver *MidiDriver_QT_create() {
@@ -750,7 +752,7 @@ void MidiDriver_CORE::send(uint32 b) {
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() {