[Scummvm-cvs-logs] CVS: scummvm/backends/midi quicktime.cpp,1.12,1.13
Max Horn
fingolfin at users.sourceforge.net
Sun Jul 10 17:51:21 CEST 2005
Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9510/backends/midi
Modified Files:
quicktime.cpp
Log Message:
Fix more GCC 4.0 warnings
Index: quicktime.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/quicktime.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- quicktime.cpp 1 Jan 2005 16:08:47 -0000 1.12
+++ quicktime.cpp 11 Jul 2005 00:48:27 -0000 1.13
@@ -67,19 +67,19 @@
};
MidiDriver_QT::MidiDriver_QT() {
- qtNoteAllocator = NULL;
+ qtNoteAllocator = 0;
for (int i = 0; i < 16; i++)
- qtNoteChannel[i] = NULL;
+ qtNoteChannel[i] = 0;
}
int MidiDriver_QT::open() {
ComponentResult qtErr = noErr;
- if (qtNoteAllocator != NULL)
+ if (qtNoteAllocator != 0)
return MERR_ALREADY_OPEN;
qtNoteAllocator = OpenDefaultComponent(kNoteAllocatorComponentType, 0);
- if (qtNoteAllocator == NULL)
+ if (qtNoteAllocator == 0)
goto bail;
simpleNoteRequest.info.flags = 0;
@@ -92,7 +92,7 @@
for (int i = 0; i < 16; i++) {
qtErr = NANewNoteChannel(qtNoteAllocator, &simpleNoteRequest, &(qtNoteChannel[i]));
- if ((qtErr != noErr) || (qtNoteChannel[i] == NULL))
+ if ((qtErr != noErr) || (qtNoteChannel[i] == 0))
goto bail;
qtErr = NAResetNoteChannel(qtNoteAllocator, qtNoteChannel[i]);
@@ -234,14 +234,14 @@
void MidiDriver_QT::dispose()
{
for (int i = 0; i < 16; i++) {
- if (qtNoteChannel[i] != NULL)
+ if (qtNoteChannel[i] != 0)
NADisposeNoteChannel(qtNoteAllocator, qtNoteChannel[i]);
- qtNoteChannel[i] = NULL;
+ qtNoteChannel[i] = 0;
}
- if (qtNoteAllocator != NULL) {
+ if (qtNoteAllocator != 0) {
CloseComponent(qtNoteAllocator);
- qtNoteAllocator = NULL;
+ qtNoteAllocator = 0;
}
}
More information about the Scummvm-git-logs
mailing list