diff options
Diffstat (limited to 'alc')
-rw-r--r-- | alc/alc.cpp | 2 | ||||
-rw-r--r-- | alc/voice.cpp | 4 | ||||
-rw-r--r-- | alc/voice.h | 11 |
3 files changed, 6 insertions, 11 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp index 03ed35cc..792ead3e 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -2193,7 +2193,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList) std::fill(std::begin(voice.mProps.Send)+num_sends, std::end(voice.mProps.Send), ALvoiceProps::SendData{}); - std::fill(voice.mSend.begin()+num_sends, voice.mSend.end(), ALvoice::SendData{}); + std::fill(voice.mSend.begin()+num_sends, voice.mSend.end(), ALvoice::TargetData{}); auto clear_chan_sends = [num_sends](ALvoice::ChannelData &chandata) -> void { std::fill(chandata.mWetParams.begin()+num_sends, chandata.mWetParams.end(), diff --git a/alc/voice.cpp b/alc/voice.cpp index 59360e4e..02378fc6 100644 --- a/alc/voice.cpp +++ b/alc/voice.cpp @@ -423,7 +423,7 @@ ALfloat *LoadBufferQueue(ALbufferlistitem *BufferListItem, ALbufferlistitem *Buf } -void DoHrtfMix(ALvoice::DirectData &Direct, const float TargetGain, DirectParams &parms, +void DoHrtfMix(ALvoice::TargetData &Direct, const float TargetGain, DirectParams &parms, const float *samples, const ALuint DstBufferSize, const ALuint Counter, const ALuint OutPos, const ALuint IrSize, ALCdevice *Device) { @@ -519,7 +519,7 @@ void DoHrtfMix(ALvoice::DirectData &Direct, const float TargetGain, DirectParams parms.Hrtf.State.Values.begin()); } -void DoNfcMix(ALvoice::DirectData &Direct, const float *TargetGains, DirectParams &parms, +void DoNfcMix(ALvoice::TargetData &Direct, const float *TargetGains, DirectParams &parms, const float *samples, const ALuint DstBufferSize, const ALuint Counter, const ALuint OutPos, ALCdevice *Device) { diff --git a/alc/voice.h b/alc/voice.h index a2a3309c..0d5d9ca4 100644 --- a/alc/voice.h +++ b/alc/voice.h @@ -222,17 +222,12 @@ struct ALvoice { ALuint mFlags; - struct DirectData { + struct TargetData { int FilterType; al::span<FloatBufferLine> Buffer; }; - DirectData mDirect; - - struct SendData { - int FilterType; - al::span<FloatBufferLine> Buffer; - }; - std::array<SendData,MAX_SENDS> mSend; + TargetData mDirect; + std::array<TargetData,MAX_SENDS> mSend; struct ChannelData { alignas(16) std::array<float,MAX_RESAMPLER_PADDING> mPrevSamples; |