aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/ALu.c
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-01-14 08:51:03 -0800
committerChris Robinson <[email protected]>2018-01-14 08:51:03 -0800
commit0152bc0d10901cc60e579e2f7fa6ebf7786e6106 (patch)
tree6b469cdb2eed1775f79b8ee4d1fc0539920f70f0 /Alc/ALu.c
parent7e491ef2b2d58e90ce34eabea21056646aace089 (diff)
Remove the SAFE_CONST macro
Seems compilers are now allowing a pointer-to-type-array to implicitly convert to pointer-to-const-type-array.
Diffstat (limited to 'Alc/ALu.c')
-rw-r--r--Alc/ALu.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 2fe579b9..c010ecba 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -1724,8 +1724,8 @@ void aluMixData(ALCdevice *device, ALvoid *OutBuffer, ALsizei NumSamples)
if(device->AmbiUp)
ambiup_process(device->AmbiUp,
- device->Dry.Buffer, device->Dry.NumChannels,
- SAFE_CONST(ALfloatBUFFERSIZE*,device->FOAOut.Buffer), SamplesToDo
+ device->Dry.Buffer, device->Dry.NumChannels, device->FOAOut.Buffer,
+ SamplesToDo
);
lidx = GetChannelIdxByName(&device->RealOut, FrontLeft);
@@ -1737,8 +1737,7 @@ void aluMixData(ALCdevice *device, ALvoid *OutBuffer, ALsizei NumSamples)
{
MixDirectHrtf(device->RealOut.Buffer[lidx], device->RealOut.Buffer[ridx],
device->Dry.Buffer[c], state->Offset, state->IrSize,
- SAFE_CONST(ALfloat2*,state->Chan[c].Coeffs),
- state->Chan[c].Values, SamplesToDo
+ state->Chan[c].Coeffs, state->Chan[c].Values, SamplesToDo
);
}
state->Offset += SamplesToDo;
@@ -1747,19 +1746,19 @@ void aluMixData(ALCdevice *device, ALvoid *OutBuffer, ALsizei NumSamples)
{
if(device->Dry.Buffer != device->FOAOut.Buffer)
bformatdec_upSample(device->AmbiDecoder,
- device->Dry.Buffer, SAFE_CONST(ALfloatBUFFERSIZE*,device->FOAOut.Buffer),
- device->FOAOut.NumChannels, SamplesToDo
+ device->Dry.Buffer, device->FOAOut.Buffer, device->FOAOut.NumChannels,
+ SamplesToDo
);
bformatdec_process(device->AmbiDecoder,
- device->RealOut.Buffer, device->RealOut.NumChannels,
- SAFE_CONST(ALfloatBUFFERSIZE*,device->Dry.Buffer), SamplesToDo
+ device->RealOut.Buffer, device->RealOut.NumChannels, device->Dry.Buffer,
+ SamplesToDo
);
}
else if(device->AmbiUp)
{
ambiup_process(device->AmbiUp,
- device->RealOut.Buffer, device->RealOut.NumChannels,
- SAFE_CONST(ALfloatBUFFERSIZE*,device->FOAOut.Buffer), SamplesToDo
+ device->RealOut.Buffer, device->RealOut.NumChannels, device->FOAOut.Buffer,
+ SamplesToDo
);
}
else if(device->Uhj_Encoder)