summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-10-02 22:28:03 +0200
committerRobin Gareus <robin@gareus.org>2015-10-02 22:28:03 +0200
commita05e48dab0bd406a83ca69da2a1c5f2e6350b1c4 (patch)
treef75d6893ba647dd6a9f043063339371a9dbd587a
parent79fecf0b619d928bed0d0634c5628d9889c67939 (diff)
fix unbound DSP calc.
-rw-r--r--libs/ardour/ardour/dsp_load_calculator.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/libs/ardour/ardour/dsp_load_calculator.h b/libs/ardour/ardour/dsp_load_calculator.h
index c7f8e2a2e0..09714bab22 100644
--- a/libs/ardour/ardour/dsp_load_calculator.h
+++ b/libs/ardour/ardour/dsp_load_calculator.h
@@ -68,16 +68,12 @@ public:
return;
}
- if (elapsed_time_us() > m_max_time_us) {
- m_dsp_load = 1.0f;
+ const float load = elapsed_time_us() / (float)m_max_time_us;
+ if (load > m_dsp_load || load > 1.0) {
+ m_dsp_load = load;
} else {
- const float load = elapsed_time_us() / (float)m_max_time_us;
- if (load > m_dsp_load) {
- m_dsp_load = load;
- } else {
- const float alpha = 0.2f * (m_max_time_us * 1e-6f);
- m_dsp_load = m_dsp_load + alpha * (load - m_dsp_load) + 1e-12;
- }
+ const float alpha = 0.2f * (m_max_time_us * 1e-6f);
+ m_dsp_load = m_dsp_load + alpha * (load - m_dsp_load) + 1e-12;
}
}