gimp r25931 - in trunk: . modules

[mitch svn gnome org]

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

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

	* 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:
   trunk/ChangeLog
   trunk/modules/controller_midi.c

Modified: trunk/modules/controller_midi.c
==============================================================================
--- trunk/modules/controller_midi.c	(original)
+++ trunk/modules/controller_midi.c	Thu Jun 12 11:25:27 2008
@@ -841,17 +841,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;