From 2cb301337a32b09449fe64d43fa1031af3d09454 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 8 Sep 2012 11:05:47 -0400
Subject: AUDIO: Fix QuickTime MIDI pitch bend

---
 audio/midiparser_qt.cpp | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'audio')

diff --git a/audio/midiparser_qt.cpp b/audio/midiparser_qt.cpp
index 2b8a02ba5e..e16c73bfec 100644
--- a/audio/midiparser_qt.cpp
+++ b/audio/midiparser_qt.cpp
@@ -149,9 +149,31 @@ uint32 MidiParser_QT::readNextEvent(EventInfo &info) {
 	case 0x4:
 	case 0x5:
 		// Controller
-		info.event = 0xB0 | ((control >> 24) & 0x1F);
-		info.basic.param1 = (control >> 16) & 0xFF;
-		info.basic.param2 = (control >> 8) & 0xFF;
+		if (((control >> 16) & 0xFF) == 32) {
+			// Pitch bend
+			info.event = 0xE0 | ((control >> 24) & 0x1F);
+
+			// Actually an 8.8 fixed point number
+			int16 value = (int16)(control & 0xFFFF);
+
+			if (value < -0x200 || value > 0x1FF) {
+				warning("QuickTime MIDI pitch bend value (%d) out of range, clipping", value);
+				value = CLIP<int16>(value, -0x200, 0x1FF);
+			}
+
+			// Now convert the value to 'normal' MIDI values
+			value += 0x200;
+			value *= 16;
+
+			// param1 holds the low 7 bits, param2 holds the high 7 bits
+			info.basic.param1 = value & 0x7F;
+			info.basic.param2 = value >> 7;
+		} else {
+			// Regular controller
+			info.event = 0xB0 | ((control >> 24) & 0x1F);
+			info.basic.param1 = (control >> 16) & 0xFF;
+			info.basic.param2 = (control >> 8) & 0xFF;
+		}
 		break;
 	case 0x6:
 	case 0x7:
-- 
cgit v1.2.3