diff options
| -rw-r--r-- | Alc/ALu.c | 6 | ||||
| -rw-r--r-- | Alc/effects/compressor.c | 4 | ||||
| -rw-r--r-- | Alc/effects/equalizer.c | 4 | ||||
| -rw-r--r-- | Alc/effects/modulator.c | 4 | ||||
| -rw-r--r-- | Alc/panning.c | 2 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 10 |
6 files changed, 15 insertions, 15 deletions
@@ -663,7 +663,7 @@ ALvoid CalcNonAttnSourceParams(ALvoice *voice, const ALsource *ALSource, const A MixGains *gains = voice->Direct.Gains[c]; ALfloat Target[MAX_OUTPUT_CHANNELS]; - ComputeBFormatGains(Device->AmbiCoeffs, Device->NumChannels, matrix.m[c], DryGain, Target); + ComputeFirstOrderGains(Device->AmbiCoeffs, Device->NumChannels, matrix.m[c], DryGain, Target); for(i = 0;i < MAX_OUTPUT_CHANNELS;i++) gains[i].Target = Target[i]; } @@ -698,8 +698,8 @@ ALvoid CalcNonAttnSourceParams(ALvoice *voice, const ALsource *ALSource, const A ALfloat Target[MAX_OUTPUT_CHANNELS]; ALuint j; - ComputeBFormatGains(Slot->AmbiCoeffs, Slot->NumChannels, - matrix.m[c], WetGain[i], Target); + ComputeFirstOrderGains(Slot->AmbiCoeffs, Slot->NumChannels, + matrix.m[c], WetGain[i], Target); for(j = 0;j < MAX_EFFECT_CHANNELS;j++) gains[j].Target = Target[j]; } diff --git a/Alc/effects/compressor.c b/Alc/effects/compressor.c index e3c26bd9..e835a5aa 100644 --- a/Alc/effects/compressor.c +++ b/Alc/effects/compressor.c @@ -71,8 +71,8 @@ static ALvoid ALcompressorState_update(ALcompressorState *state, const ALCdevice 0.0f, 0.0f, 0.0f, scale ); for(i = 0;i < 4;i++) - ComputeBFormatGains(device->AmbiCoeffs, device->NumChannels, - matrix.m[i], slot->Gain, state->Gain[i]); + ComputeFirstOrderGains(device->AmbiCoeffs, device->NumChannels, + matrix.m[i], slot->Gain, state->Gain[i]); } static ALvoid ALcompressorState_process(ALcompressorState *state, ALuint SamplesToDo, const ALfloat (*restrict SamplesIn)[BUFFERSIZE], ALfloat (*restrict SamplesOut)[BUFFERSIZE], ALuint NumChannels) diff --git a/Alc/effects/equalizer.c b/Alc/effects/equalizer.c index 0a1ff1db..051e8c7f 100644 --- a/Alc/effects/equalizer.c +++ b/Alc/effects/equalizer.c @@ -111,8 +111,8 @@ static ALvoid ALequalizerState_update(ALequalizerState *state, const ALCdevice * 0.0f, 0.0f, 0.0f, gain ); for(i = 0;i < MAX_EFFECT_CHANNELS;i++) - ComputeBFormatGains(device->AmbiCoeffs, device->NumChannels, - matrix.m[i], slot->Gain, state->Gain[i]); + ComputeFirstOrderGains(device->AmbiCoeffs, device->NumChannels, + matrix.m[i], slot->Gain, state->Gain[i]); /* Calculate coefficients for the each type of filter. Note that the shelf * filters' gain is for the reference frequency, which is the centerpoint diff --git a/Alc/effects/modulator.c b/Alc/effects/modulator.c index bb74d3ec..cd6ccb22 100644 --- a/Alc/effects/modulator.c +++ b/Alc/effects/modulator.c @@ -130,8 +130,8 @@ static ALvoid ALmodulatorState_update(ALmodulatorState *state, const ALCdevice * 0.0f, 0.0f, 0.0f, scale ); for(i = 0;i < MAX_EFFECT_CHANNELS;i++) - ComputeBFormatGains(Device->AmbiCoeffs, Device->NumChannels, - matrix.m[i], Slot->Gain, state->Gain[i]); + ComputeFirstOrderGains(Device->AmbiCoeffs, Device->NumChannels, + matrix.m[i], Slot->Gain, state->Gain[i]); } static ALvoid ALmodulatorState_process(ALmodulatorState *state, ALuint SamplesToDo, const ALfloat (*restrict SamplesIn)[BUFFERSIZE], ALfloat (*restrict SamplesOut)[BUFFERSIZE], ALuint NumChannels) diff --git a/Alc/panning.c b/Alc/panning.c index c4eb3f82..8464efd6 100644 --- a/Alc/panning.c +++ b/Alc/panning.c @@ -154,7 +154,7 @@ void ComputePanningGains(const ChannelConfig *chancoeffs, ALuint numchans, const gains[i] = 0.0f; } -void ComputeBFormatGains(const ChannelConfig *chancoeffs, ALuint numchans, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]) +void ComputeFirstOrderGains(const ChannelConfig *chancoeffs, ALuint numchans, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]) { ALuint i, j; diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 63a03adc..eb2ea534 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -322,13 +322,13 @@ void ComputeAmbientGains(const ChannelConfig *chancoeffs, ALuint numchans, ALflo void ComputePanningGains(const ChannelConfig *chancoeffs, ALuint numchans, const ALfloat coeffs[MAX_AMBI_COEFFS], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]); /** - * ComputeBFormatGains + * ComputeFirstOrderGains * - * Sets channel gains for a given (first-order) B-Format input channel. The - * matrix is a 1x4 'slice' of the rotation matrix for the given channel used to - * orient the soundfield. + * Sets channel gains for a first-order ambisonics input channel. The matrix is + * a 1x4 'slice' of a transform matrix for the input channel, used to scale and + * orient the sound samples. */ -void ComputeBFormatGains(const ChannelConfig *chancoeffs, ALuint numchans, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]); +void ComputeFirstOrderGains(const ChannelConfig *chancoeffs, ALuint numchans, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS]); ALvoid UpdateContextSources(ALCcontext *context); |