aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/bformatdec.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/bformatdec.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/bformatdec.c')
-rw-r--r--Alc/bformatdec.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/Alc/bformatdec.c b/Alc/bformatdec.c
index 2c5326d4..ae1f7381 100644
--- a/Alc/bformatdec.c
+++ b/Alc/bformatdec.c
@@ -433,12 +433,10 @@ void bformatdec_process(struct BFormatDec *dec, ALfloat (*restrict OutBuffer)[BU
memset(dec->ChannelMix, 0, SamplesToDo*sizeof(ALfloat));
MixMatrixRow(dec->ChannelMix, dec->Matrix.Dual[chan][FB_HighFreq],
- SAFE_CONST(ALfloatBUFFERSIZE*,dec->SamplesHF), dec->NumChannels, 0,
- SamplesToDo
+ dec->SamplesHF, dec->NumChannels, 0, SamplesToDo
);
MixMatrixRow(dec->ChannelMix, dec->Matrix.Dual[chan][FB_LowFreq],
- SAFE_CONST(ALfloatBUFFERSIZE*,dec->SamplesLF), dec->NumChannels, 0,
- SamplesToDo
+ dec->SamplesLF, dec->NumChannels, 0, SamplesToDo
);
for(i = 0;i < SamplesToDo;i++)
@@ -489,8 +487,7 @@ void bformatdec_upSample(struct BFormatDec *dec, ALfloat (*restrict OutBuffer)[B
/* Now write each band to the output. */
MixMatrixRow(OutBuffer[i], dec->UpSampler[i].Gains,
- SAFE_CONST(ALfloatBUFFERSIZE*,dec->Samples), FB_Max, 0,
- SamplesToDo
+ dec->Samples, FB_Max, 0, SamplesToDo
);
}
}
@@ -605,8 +602,7 @@ void ambiup_process(struct AmbiUpsampler *ambiup, ALfloat (*restrict OutBuffer)[
for(j = 0;j < OutChannels;j++)
MixMatrixRow(OutBuffer[j], ambiup->Gains[i][j],
- SAFE_CONST(ALfloatBUFFERSIZE*,ambiup->Samples), FB_Max, 0,
- SamplesToDo
+ ambiup->Samples, FB_Max, 0, SamplesToDo
);
}
}