diff options
| -rw-r--r-- | Alc/midi/fluidsynth.c | 4 | ||||
| -rw-r--r-- | Alc/midi/sf2load.c | 2 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 12 | ||||
| -rw-r--r-- | OpenAL32/alFontsound.c | 2 | ||||
| -rw-r--r-- | OpenAL32/alMidi.c | 2 |
5 files changed, 11 insertions, 11 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; diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 82105ab6..b6a9f0ae 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -55,11 +55,11 @@ #define AL_ONE_SOFT 0x0080 #define AL_NOTEON_VELOCITY_SOFT 0x0082 #define AL_NOTEON_KEY_SOFT 0x0083 -/* aftertouch */ -/* channelpressure */ -/* pitchbend */ +/* AL_KEYPRESSURE_SOFT */ +/* AL_CHANNELPRESSURE_SOFT */ +/* AL_PITCHBEND_SOFT */ #define AL_PITCHBEND_SENSITIVITY_SOFT 0x0090 -/* 0...127 CC */ +/* CC 0...127 */ /* Source Type */ #define AL_UNORM_SOFT 0x0000 @@ -74,7 +74,7 @@ #define AL_SWITCH_SOFT 0x0C00 /* Transform op */ -/* linear */ +/* AL_LINEAR_SOFT */ #define AL_ABSOLUTE_SOFT 0x0002 #define AL_SAMPLE_START_SOFT 0x2000 @@ -132,7 +132,7 @@ #define AL_FORMAT_TYPE_SOFT 0x1991 #define AL_NOTEOFF_SOFT 0x0080 #define AL_NOTEON_SOFT 0x0090 -#define AL_AFTERTOUCH_SOFT 0x00A0 +#define AL_KEYPRESSURE_SOFT 0x00A0 #define AL_CONTROLLERCHANGE_SOFT 0x00B0 #define AL_PROGRAMCHANGE_SOFT 0x00C0 #define AL_CHANNELPRESSURE_SOFT 0x00D0 diff --git a/OpenAL32/alFontsound.c b/OpenAL32/alFontsound.c index cfe38ee7..94cf3064 100644 --- a/OpenAL32/alFontsound.c +++ b/OpenAL32/alFontsound.c @@ -838,7 +838,7 @@ void ALfontsound_setModStagei(ALfontsound *self, ALCcontext *context, ALsizei st /* fall-through */ case AL_SOURCE0_INPUT_SOFT: if(!(value == AL_ONE_SOFT || value == AL_NOTEON_VELOCITY_SOFT || - value == AL_NOTEON_KEY_SOFT || value == AL_AFTERTOUCH_SOFT || + value == AL_NOTEON_KEY_SOFT || value == AL_KEYPRESSURE_SOFT || value == AL_CHANNELPRESSURE_SOFT || value == AL_PITCHBEND_SOFT || value == AL_PITCHBEND_SENSITIVITY_SOFT || (value > 0 && value < 120 && !(value == 6 || (value >= 32 && value <= 63) || diff --git a/OpenAL32/alMidi.c b/OpenAL32/alMidi.c index 257a9481..0679b64c 100644 --- a/OpenAL32/alMidi.c +++ b/OpenAL32/alMidi.c @@ -72,7 +72,7 @@ AL_API void AL_APIENTRY alMidiEventSOFT(ALuint64SOFT time, ALenum event, ALsizei if(!context) return; if(!(event == AL_NOTEOFF_SOFT || event == AL_NOTEON_SOFT || - event == AL_AFTERTOUCH_SOFT || event == AL_CONTROLLERCHANGE_SOFT || + event == AL_KEYPRESSURE_SOFT || event == AL_CONTROLLERCHANGE_SOFT || event == AL_PROGRAMCHANGE_SOFT || event == AL_CHANNELPRESSURE_SOFT || event == AL_PITCHBEND_SOFT)) SET_ERROR_AND_GOTO(context, AL_INVALID_ENUM, done); |