diff options
author | Chris Robinson <[email protected]> | 2018-12-23 08:51:28 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2018-12-23 08:51:28 -0800 |
commit | 3fe38fed7c29869a43b42d634417452b1a5fedbc (patch) | |
tree | b61cd690dbaced50afef8ff69c880d9a99136149 /Alc/effects/pshifter.cpp | |
parent | e218999b4f408b7fd35daa9d021288b68f5b4ab5 (diff) |
Mix effect slot output to the effect target if it's set
Diffstat (limited to 'Alc/effects/pshifter.cpp')
-rw-r--r-- | Alc/effects/pshifter.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/Alc/effects/pshifter.cpp b/Alc/effects/pshifter.cpp index 3825bfd5..321e7492 100644 --- a/Alc/effects/pshifter.cpp +++ b/Alc/effects/pshifter.cpp @@ -175,18 +175,27 @@ ALboolean ALpshifterState::deviceUpdate(const ALCdevice *device) void ALpshifterState::update(const ALCcontext *context, const ALeffectslot *slot, const ALeffectProps *props) { - const ALCdevice *device = context->Device; - ALfloat coeffs[MAX_AMBI_COEFFS]; - float pitch; - - pitch = std::pow(2.0f, + const float pitch{std::pow(2.0f, (ALfloat)(props->Pshifter.CoarseTune*100 + props->Pshifter.FineTune) / 1200.0f - ); + )}; mPitchShiftI = fastf2i(pitch*FRACTIONONE); mPitchShift = mPitchShiftI * (1.0f/FRACTIONONE); + ALfloat coeffs[MAX_AMBI_COEFFS]; CalcAngleCoeffs(0.0f, 0.0f, 0.0f, coeffs); - ComputePanGains(&device->Dry, coeffs, slot->Params.Gain, mTargetGains); + if(ALeffectslot *target{slot->Params.Target}) + { + mOutBuffer = target->WetBuffer; + mOutChannels = target->NumChannels; + ComputePanGains(target, coeffs, slot->Params.Gain, mTargetGains); + } + else + { + const ALCdevice *device{context->Device}; + mOutBuffer = device->Dry.Buffer; + mOutChannels = device->Dry.NumChannels; + ComputePanGains(&device->Dry, coeffs, slot->Params.Gain, mTargetGains); + } } void ALpshifterState::process(ALsizei SamplesToDo, const ALfloat (*RESTRICT SamplesIn)[BUFFERSIZE], ALfloat (*RESTRICT SamplesOut)[BUFFERSIZE], ALsizei NumChannels) |