From b6879d1a68c722acdcb554fcd3041f1e05b0fea9 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Mon, 28 Jul 2003 01:44:32 +0000
Subject: [PATCH] Date: Sun, 27 Jul 2003 22:20:53 +0200 From: Max Horn Subject:
 small SDL_mixer fix

the attached patch for SDL_mixer fixes the handling of pan events in
the native Mac OS midi driver.
---
 native_midi/native_midi_mac.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/native_midi/native_midi_mac.c b/native_midi/native_midi_mac.c
index 0063a758..fd4c3887 100644
--- a/native_midi/native_midi_mac.c
+++ b/native_midi/native_midi_mac.c
@@ -406,7 +406,7 @@ Uint32 *BuildTuneSequence(MIDIEvent *evntlist, int ppqn, int part_poly_max[32],
 					int duration = (int)((noteOffPos->time - eventPos->time)*tick);
 					
 					REST_IF_NECESSARY();
-					/* Now we need to check if we get along with a normal Note Even, or if we need an extended one... */
+					/* Now we need to check if we get along with a normal Note Event, or if we need an extended one... */
 					if (duration < 2048 && pitch>=32 && pitch<=95 && velocity>=0 && velocity<=127)
 					{
 						qtma_StuffNoteEvent(*tunePos, part, pitch, velocity, duration);
@@ -421,7 +421,7 @@ Uint32 *BuildTuneSequence(MIDIEvent *evntlist, int ppqn, int part_poly_max[32],
 			}
 			break;
 		case MIDI_STATUS_AFTERTOUCH:
-			/* NYI */
+			/* NYI - use kControllerAfterTouch. But how are the parameters to be mapped? */
 			break;
 		case MIDI_STATUS_CONTROLLER:
 			controller = eventPos->data[0];
@@ -444,9 +444,9 @@ Uint32 *BuildTuneSequence(MIDIEvent *evntlist, int ppqn, int part_poly_max[32],
 				}
 				break;
 			case kControllerPan:
-				if(channel_pan[channel] != ((value-64)<<8))
+				if(channel_pan[channel] != (value << 1) + 256)
 				{
-					channel_pan[channel] = (value-64)<<8;
+					channel_pan[channel] = (value << 1) + 256;
 					if(part>=0 && part<=31)
 					{
 						REST_IF_NECESSARY();