gimp r25932 - in branches/gimp-2-4: . modules

[mitch svn gnome org]

Author: mitch
Date: Thu Jun 12 11:26:22 2008
New Revision: 25932
URL: http://svn.gnome.org/viewvc/gimp?rev=25932&view=rev

Log:
2008-06-12  Michael Natterer  <mitch gimp org>

	Merged from trunk:

	* modules/controller_midi.c: applied patch from S. Fielding which
	passes the right MIDI channel from the ALSA event to midi_event().
	Fixes bug #537960.



Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/modules/controller_midi.c

Modified: branches/gimp-2-4/modules/controller_midi.c
==============================================================================
--- branches/gimp-2-4/modules/controller_midi.c	(original)
+++ branches/gimp-2-4/modules/controller_midi.c	Thu Jun 12 11:26:22 2008
@@ -869,17 +869,20 @@
       switch (event->type)
         {
         case SND_SEQ_EVENT_NOTEON:
-          midi_event (midi, midi->channel, event->data.note.note,
+          midi_event (midi, event->data.note.channel,
+                      event->data.note.note,
                       (gdouble) event->data.note.velocity / 127.0);
           break;
 
         case SND_SEQ_EVENT_NOTEOFF:
-          midi_event (midi, midi->channel, event->data.note.note + 128,
+          midi_event (midi, event->data.note.channel,
+                      event->data.note.note + 128,
                       (gdouble) event->data.note.velocity / 127.0);
           break;
 
         case SND_SEQ_EVENT_CONTROLLER:
-          midi_event (midi, midi->channel, event->data.control.param + 256,
+          midi_event (midi, event->data.control.channel,
+                      event->data.control.param + 256,
                       (gdouble) event->data.control.value / 127.0);
           break;