[Scummvm-cvs-logs] SF.net SVN: scummvm:[48277] scummvm/trunk/backends/midi
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Mar 18 16:04:57 CET 2010
Revision: 48277
http://scummvm.svn.sourceforge.net/scummvm/?rev=48277&view=rev
Author: fingolfin
Date: 2010-03-18 15:04:57 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
Fix warnings
Modified Paths:
--------------
scummvm/trunk/backends/midi/coreaudio.cpp
scummvm/trunk/backends/midi/coremidi.cpp
Modified: scummvm/trunk/backends/midi/coreaudio.cpp
===================================================================
--- scummvm/trunk/backends/midi/coreaudio.cpp 2010-03-18 15:04:38 UTC (rev 48276)
+++ scummvm/trunk/backends/midi/coreaudio.cpp 2010-03-18 15:04:57 UTC (rev 48277)
@@ -142,7 +142,7 @@
}
if (err != noErr)
- warning("Failed loading custom sound font '%s' (error %ld)\n", soundfont, err);
+ warning("Failed loading custom sound font '%s' (error %ld)\n", soundfont, (long)err);
}
#ifdef COREAUDIO_DISABLE_REVERB
Modified: scummvm/trunk/backends/midi/coremidi.cpp
===================================================================
--- scummvm/trunk/backends/midi/coremidi.cpp 2010-03-18 15:04:38 UTC (rev 48276)
+++ scummvm/trunk/backends/midi/coremidi.cpp 2010-03-18 15:04:57 UTC (rev 48277)
@@ -109,8 +109,8 @@
}
void MidiDriver_CoreMIDI::send(uint32 b) {
- assert(mOutPort != NULL);
- assert(mDest != NULL);
+ assert(mOutPort != 0);
+ assert(mDest != 0);
// Extract the MIDI data
byte status_byte = (b & 0x000000FF);
@@ -153,8 +153,8 @@
}
void MidiDriver_CoreMIDI::sysEx(const byte *msg, uint16 length) {
- assert(mOutPort != NULL);
- assert(mDest != NULL);
+ assert(mOutPort != 0);
+ assert(mDest != 0);
byte buf[384];
MIDIPacketList *packetList = (MIDIPacketList *)buf;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list