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

Fix for MSVC decaying arrays to pointers with ?:

Browse Source
This commit is contained in:
Chris Robinson
2019-03-09 21:54:15 -08:00
parent 106671d451
commit 6a95189ef6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/mixvoice.cpp
+5 -5
View File
@@ -627,8 +627,8 @@ void MixSource(ALvoice *voice, const ALuint SourceID, ALCcontext *Context, const
const ALfloat *samples{DoFilters(&parms.LowPass, &parms.HighPass,
Device->FilteredData, ResampledData, DstBufferSize, voice->Direct.FilterType)};
const ALfloat (&TargetGains)[MAX_OUTPUT_CHANNELS] =
UNLIKELY(vstate==ALvoice::Stopping) ? SilentTarget : parms.Gains.Target;
const ALfloat *TargetGains{UNLIKELY(vstate==ALvoice::Stopping) ? SilentTarget :
parms.Gains.Target};
if(!(voice->Flags&VOICE_HAS_HRTF))
{
if(!(voice->Flags&VOICE_HAS_NFC))
@@ -643,7 +643,7 @@ void MixSource(ALvoice *voice, const ALuint SourceID, ALCcontext *Context, const
ALfloat (&nfcsamples)[BUFFERSIZE] = Device->NfcSampleData;
ALsizei chanoffset{voice->Direct.ChannelsPerOrder[0]};
using FilterProc = void (NfcFilter::*)(float*,const float*,int);
auto apply_nfc = [voice,&parms,samples,&TargetGains,DstBufferSize,Counter,OutPos,&chanoffset,&nfcsamples](FilterProc process, ALsizei order) -> void
auto apply_nfc = [voice,&parms,samples,TargetGains,DstBufferSize,Counter,OutPos,&chanoffset,&nfcsamples](FilterProc process, ALsizei order) -> void
{
if(voice->Direct.ChannelsPerOrder[order] < 1)
return;
@@ -740,8 +740,8 @@ void MixSource(ALvoice *voice, const ALuint SourceID, ALCcontext *Context, const
const ALfloat *samples{DoFilters(&parms.LowPass, &parms.HighPass,
FilterBuf, ResampledData, DstBufferSize, send.FilterType)};
const ALfloat (&TargetGains)[MAX_OUTPUT_CHANNELS] =
UNLIKELY(vstate==ALvoice::Stopping) ? SilentTarget : parms.Gains.Target;
const ALfloat *TargetGains{UNLIKELY(vstate==ALvoice::Stopping) ? SilentTarget :
parms.Gains.Target};
MixSamples(samples, send.Channels, send.Buffer, parms.Gains.Current,
TargetGains, Counter, OutPos, DstBufferSize);
};