From 3f45b3c0c900a6b513d8917cc4df00ca100a7c09 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 11 Mar 2023 18:15:59 -0800
Subject: Avoid copying to a temporary
---
al/effects/chorus.cpp | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
(limited to 'al/effects/chorus.cpp')
diff --git a/al/effects/chorus.cpp b/al/effects/chorus.cpp
index c8b32aed..305259a4 100644
--- a/al/effects/chorus.cpp
+++ b/al/effects/chorus.cpp
@@ -607,25 +607,27 @@ public:
}
}
- static bool Commit(const EaxEffectProps &props, EaxEffectProps &props_,
- EffectProps &al_effect_props_)
+ static bool Commit(const EaxEffectProps &props, EaxEffectProps &props_, EffectProps &al_props_)
{
- const auto orig = props_;
- props_ = props;
+ if(props.mType == props_.mType)
+ {
+ auto&& src = props_.*Field;
+ auto&& dst = props.*Field;
+ if(dst.ulWaveform == src.ulWaveform && dst.lPhase == src.lPhase
+ && dst.flRate == src.flRate && dst.flDepth == src.flDepth
+ && dst.flFeedback == src.flFeedback && dst.flDelay == src.flDelay)
+ return false;
+ }
- auto&& src = orig.*Field;
- auto&& dst = props_.*Field;
- if(orig.mType == props_.mType && dst.ulWaveform == src.ulWaveform
- && dst.lPhase == src.lPhase && dst.flRate == src.flRate && dst.flDepth == src.flDepth
- && dst.flFeedback == src.flFeedback && dst.flDelay == src.flDelay)
- return false;
-
- al_effect_props_.Chorus.Waveform = Traits::eax_waveform(dst.ulWaveform);
- al_effect_props_.Chorus.Phase = static_cast<ALint>(dst.lPhase);
- al_effect_props_.Chorus.Rate = dst.flRate;
- al_effect_props_.Chorus.Depth = dst.flDepth;
- al_effect_props_.Chorus.Feedback = dst.flFeedback;
- al_effect_props_.Chorus.Delay = dst.flDelay;
+ props_ = props;
+ auto&& dst = props.*Field;
+
+ al_props_.Chorus.Waveform = Traits::eax_waveform(dst.ulWaveform);
+ al_props_.Chorus.Phase = static_cast<int>(dst.lPhase);
+ al_props_.Chorus.Rate = dst.flRate;
+ al_props_.Chorus.Depth = dst.flDepth;
+ al_props_.Chorus.Feedback = dst.flFeedback;
+ al_props_.Chorus.Delay = dst.flDelay;
return true;
}
--
cgit v1.2.3