aboutsummaryrefslogtreecommitdiff
path: root/backends/midi
diff options
context:
space:
mode:
authorMax Horn2003-05-21 16:07:39 +0000
committerMax Horn2003-05-21 16:07:39 +0000
commit9fb601cd3fa5c869a50c2e7ac8fca1a450e8487c (patch)
treecff1b54d6fc84728824022579345cac701fdf560 /backends/midi
parentf0b12ebfa99e093150a1e02709f4ce5ca4204fff (diff)
downloadscummvm-rg350-9fb601cd3fa5c869a50c2e7ac8fca1a450e8487c.tar.gz
scummvm-rg350-9fb601cd3fa5c869a50c2e7ac8fca1a450e8487c.tar.bz2
scummvm-rg350-9fb601cd3fa5c869a50c2e7ac8fca1a450e8487c.zip
silence 'Unknown MIDI effect' warning in Simon2
svn-id: r7785
Diffstat (limited to 'backends/midi')
-rw-r--r--backends/midi/quicktime.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/backends/midi/quicktime.cpp b/backends/midi/quicktime.cpp
index d5ff73607e..e61e6409f2 100644
--- a/backends/midi/quicktime.cpp
+++ b/backends/midi/quicktime.cpp
@@ -149,8 +149,7 @@ void MidiDriver_QT::send(uint32 b) {
case 0xB0: // Effect
switch (midiCmd[1]) {
case 0x01: // Modulation
- NASetController(qtNoteAllocator, qtNoteChannel[chanID],
- kControllerModulationWheel, midiCmd[2] << 8);
+ NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerModulationWheel, midiCmd[2] << 8);
break;
case 0x07: // Volume
@@ -158,8 +157,7 @@ void MidiDriver_QT::send(uint32 b) {
break;
case 0x0A: // Pan
- NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerPan,
- (midiCmd[2] << 1) + 0xFF);
+ NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerPan, (midiCmd[2] << 1) + 0xFF);
break;
case 0x40: // Sustain on/off
@@ -188,12 +186,12 @@ void MidiDriver_QT::send(uint32 b) {
break;
case 0x12: // Occurs in Scumm games
+ case 0x77: // Occurs in Simon2
case 0x79: // Occurs in Simon1
// What are these ?!? Ignore it for now
break;
default:
- // Error: Unknown MIDI effect: 007f76b3
warning("Unknown MIDI effect: %08x", (int)b);
break;
}