Tempo ramps - new (old) map solving strategy.

[ardour.git] / libs / ardour / ardour / dsp_load_calculator.h

diff --git a/libs/ardour/ardour/dsp_load_calculator.h b/libs/ardour/ardour/dsp_load_calculator.h
index 09714bab22a2f9c0442497c56512f2666a040544..c7c0c0b83e074384ba4d55f86c719d9b5bbb10e2 100644 (file)
--- a/libs/ardour/ardour/dsp_load_calculator.h
+++ b/libs/ardour/ardour/dsp_load_calculator.h
@@ -37,7 +37,7 @@ public:
        }
 
        void set_max_time(double samplerate, uint32_t period_size) {
-               m_max_time_us = (1e6 / samplerate) * period_size;
+               m_max_time_us = period_size * 1e6 / samplerate;
        }
 
        void set_max_time_us(uint64_t max_time_us) {
@@ -68,12 +68,13 @@ public:
                        return;
                }
 
-               const float load = elapsed_time_us() / (float)m_max_time_us;
+               const float load = (float) elapsed_time_us() / (float)m_max_time_us;
                if (load > m_dsp_load || load > 1.0) {
                        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;
+                       m_dsp_load = std::min (1.f, m_dsp_load);
+                       m_dsp_load += alpha * (load - m_dsp_load) + 1e-12;
                }
        }