dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged from trunk: 

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.


svn path=/branches/gimp-2-4/; revision=25932
This commit is contained in:
Michael Natterer 2008-06-12 11:26:22 +00:00 committed by Michael Natterer
parent cdeb9f08b1
commit ef3d38357c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2008-06-04 Sven Neumann <sven@gimp.org>
Merged from trunk:

9
modules/controller_midi.c
View File

@ -869,17 +869,20 @@ midi_alsa_dispatch (GSource *source,
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;