aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/panning.c
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-09-19 21:09:19 -0700
committerChris Robinson <[email protected]>2018-09-19 21:09:19 -0700
commit6eb980d1b23bec90226b2012a0346f7be8407fdd (patch)
tree83548b1449961ea843cc552783c269e98c6181e9 /Alc/panning.c
parent48b7745a49296bd70e16fbf8eeed2d47c84e72a9 (diff)
Remove a couple duplicate functions
Diffstat (limited to 'Alc/panning.c')
-rw-r--r--Alc/panning.c29
1 files changed, 2 insertions, 27 deletions
diff --git a/Alc/panning.c b/Alc/panning.c
index ce0550cf..6bd42709 100644
--- a/Alc/panning.c
+++ b/Alc/panning.c
@@ -152,7 +152,7 @@ void CalcAmbiCoeffs(const ALfloat y, const ALfloat z, const ALfloat x, const ALf
}
-void ComputePanningGainsMC(const ChannelConfig *chancoeffs, ALsizei numchans, ALsizei numcoeffs, const ALfloat coeffs[MAX_AMBI_COEFFS], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
+void ComputePanningGainsMC(const ChannelConfig *chancoeffs, ALsizei numchans, ALsizei numcoeffs, const ALfloat*restrict coeffs, ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
{
ALsizei i, j;
@@ -167,7 +167,7 @@ void ComputePanningGainsMC(const ChannelConfig *chancoeffs, ALsizei numchans, AL
gains[i] = 0.0f;
}
-void ComputePanningGainsBF(const BFChannelConfig *chanmap, ALsizei numchans, const ALfloat coeffs[MAX_AMBI_COEFFS], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
+void ComputePanningGainsBF(const BFChannelConfig *chanmap, ALsizei numchans, const ALfloat*restrict coeffs, ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
{
ALsizei i;
@@ -177,31 +177,6 @@ void ComputePanningGainsBF(const BFChannelConfig *chanmap, ALsizei numchans, con
gains[i] = 0.0f;
}
-void ComputeFirstOrderGainsMC(const ChannelConfig *chancoeffs, ALsizei numchans, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
-{
- ALsizei i, j;
-
- for(i = 0;i < numchans;i++)
- {
- float gain = 0.0f;
- for(j = 0;j < 4;j++)
- gain += chancoeffs[i][j] * mtx[j];
- gains[i] = clampf(gain, 0.0f, 1.0f) * ingain;
- }
- for(;i < MAX_OUTPUT_CHANNELS;i++)
- gains[i] = 0.0f;
-}
-
-void ComputeFirstOrderGainsBF(const BFChannelConfig *chanmap, ALsizei numchans, const ALfloat mtx[4], ALfloat ingain, ALfloat gains[MAX_OUTPUT_CHANNELS])
-{
- ALsizei i;
-
- for(i = 0;i < numchans;i++)
- gains[i] = chanmap[i].Scale * mtx[chanmap[i].Index] * ingain;
- for(;i < MAX_OUTPUT_CHANNELS;i++)
- gains[i] = 0.0f;
-}
-
static inline const char *GetLabelFromChannel(enum Channel channel)
{