diff options
| author | Chris Robinson <[email protected]> | 2014-01-17 04:18:49 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-01-17 04:18:49 -0800 |
| commit | 65a5311449da52d29fbdddcc1f7077a69f844296 (patch) | |
| tree | 31c3f8283a05829367e6ead55ed8b013e9b702e3 /Alc/midi | |
| parent | d65279ac2a56c35bf7ef64c23d57b685e349d4c1 (diff) | |
Rename aftertouch to keypressure
Diffstat (limited to 'Alc/midi')
| -rw-r--r-- | Alc/midi/fluidsynth.c | 4 | ||||
| -rw-r--r-- | Alc/midi/sf2load.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Alc/midi/fluidsynth.c b/Alc/midi/fluidsynth.c index fea40058..9d58f87b 100644 --- a/Alc/midi/fluidsynth.c +++ b/Alc/midi/fluidsynth.c @@ -35,7 +35,7 @@ static int getGenInput(ALenum input) case AL_ONE_SOFT: return FLUID_MOD_NONE; case AL_NOTEON_VELOCITY_SOFT: return FLUID_MOD_VELOCITY; case AL_NOTEON_KEY_SOFT: return FLUID_MOD_KEY; - case AL_AFTERTOUCH_SOFT: return FLUID_MOD_KEYPRESSURE; + case AL_KEYPRESSURE_SOFT: return FLUID_MOD_KEYPRESSURE; case AL_CHANNELPRESSURE_SOFT: return FLUID_MOD_CHANNELPRESSURE; case AL_PITCHBEND_SOFT: return FLUID_MOD_PITCHWHEEL; case AL_PITCHBEND_SENSITIVITY_SOFT: return FLUID_MOD_PITCHWHEELSENS; @@ -714,7 +714,7 @@ static void FSynth_processQueue(FSynth *self, ALuint64 time) case AL_NOTEON_SOFT: fluid_synth_noteon(self->Synth, (evt->event&0x0F), evt->param.val[0], evt->param.val[1]); break; - case AL_AFTERTOUCH_SOFT: + case AL_KEYPRESSURE_SOFT: break; case AL_CONTROLLERCHANGE_SOFT: diff --git a/Alc/midi/sf2load.c b/Alc/midi/sf2load.c index 40023301..ef032535 100644 --- a/Alc/midi/sf2load.c +++ b/Alc/midi/sf2load.c @@ -719,7 +719,7 @@ static ALenum getModSrcInput(int input) if(input == 0) return AL_ONE_SOFT; if(input == 2) return AL_NOTEON_VELOCITY_SOFT; if(input == 3) return AL_NOTEON_KEY_SOFT; - if(input == 10) return AL_AFTERTOUCH_SOFT; + if(input == 10) return AL_KEYPRESSURE_SOFT; if(input == 13) return AL_CHANNELPRESSURE_SOFT; if(input == 14) return AL_PITCHBEND_SOFT; if(input == 16) return AL_PITCHBEND_SENSITIVITY_SOFT; |