Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove an unnecessary union container

Browse Source
This commit is contained in:
Chris Robinson
2014-11-22 12:58:54 -08:00
parent e41cfeca84
commit fb511351df
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/ALu.c
+6 -6
View File
@@ -145,7 +145,7 @@ static void UpdateDryStepping(DirectParams *params, ALuint num_chans)
{
for(i = 0;i < num_chans;i++)
{
MixGains *gains = params->Mix.Gains[i];
MixGains *gains = params->Gains[i];
for(j = 0;j < MAX_OUTPUT_CHANNELS;j++)
{
gains[j].Current = gains[j].Target;
@@ -159,7 +159,7 @@ static void UpdateDryStepping(DirectParams *params, ALuint num_chans)
for(i = 0;i < num_chans;i++)
{
MixGains *gains = params->Mix.Gains[i];
MixGains *gains = params->Gains[i];
for(j = 0;j < MAX_OUTPUT_CHANNELS;j++)
{
ALfloat cur = maxf(gains[j].Current, FLT_EPSILON);
@@ -477,7 +477,7 @@ ALvoid CalcNonAttnSourceParams(ALvoice *voice, const ALsource *ALSource, const A
for(c = 0;c < num_channels;c++)
{
MixGains *gains = voice->Direct.Mix.Gains[c];
MixGains *gains = voice->Direct.Gains[c];
ALfloat Target[MAX_OUTPUT_CHANNELS];
ComputeBFormatGains(Device, matrix[c], DryGain, Target);
@@ -497,7 +497,7 @@ ALvoid CalcNonAttnSourceParams(ALvoice *voice, const ALsource *ALSource, const A
{
for(c = 0;c < num_channels;c++)
{
MixGains *gains = voice->Direct.Mix.Gains[c];
MixGains *gains = voice->Direct.Gains[c];
int idx;
for(j = 0;j < MAX_OUTPUT_CHANNELS;j++)
@@ -513,7 +513,7 @@ ALvoid CalcNonAttnSourceParams(ALvoice *voice, const ALsource *ALSource, const A
{
for(c = 0;c < num_channels;c++)
{
MixGains *gains = voice->Direct.Mix.Gains[c];
MixGains *gains = voice->Direct.Gains[c];
ALfloat Target[MAX_OUTPUT_CHANNELS];
/* Special-case LFE */
@@ -916,7 +916,7 @@ ALvoid CalcSourceParams(ALvoice *voice, const ALsource *ALSource, const ALCconte
}
{
MixGains *gains = voice->Direct.Mix.Gains[0];
MixGains *gains = voice->Direct.Gains[0];
ALfloat radius = ALSource->Radius;
ALfloat Target[MAX_OUTPUT_CHANNELS];
Alc/mixer.c
+1 -1
View File
@@ -415,7 +415,7 @@ ALvoid MixSource(ALvoice *voice, ALsource *Source, ALCdevice *Device, ALuint Sam
Device->FilteredData, ResampledData, DstBufferSize,
parms->Filters[chan].ActiveType
);
Mix(samples, Device->NumChannels, parms->OutBuffer, parms->Mix.Gains[chan],
Mix(samples, Device->NumChannels, parms->OutBuffer, parms->Gains[chan],
parms->Counter, OutPos, DstBufferSize);
}
OpenAL32/Include/alu.h
+1 -3
View File
@@ -70,9 +70,7 @@ typedef struct DirectParams {
ALfilterState HighPass;
} Filters[MAX_INPUT_CHANNELS];
union {
MixGains Gains[MAX_INPUT_CHANNELS][MAX_OUTPUT_CHANNELS];
} Mix;
MixGains Gains[MAX_INPUT_CHANNELS][MAX_OUTPUT_CHANNELS];
} DirectParams;
typedef struct SendParams {