From 499d425b4b9ebe0d1c13038cd9acf4777af94320 Mon Sep 17 00:00:00 2001 From: Lost Robot <34612565+DouglasDGI@users.noreply.github.com> Date: Fri, 14 Jun 2019 18:38:56 -0600 Subject: [PATCH] Increase Mixer fader falloff speed This also fixes a display bug that is present with large fader falloff speeds. --- src/gui/FxMixerView.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/gui/FxMixerView.cpp b/src/gui/FxMixerView.cpp index 90cd1dbf3..4ae2a630a 100644 --- a/src/gui/FxMixerView.cpp +++ b/src/gui/FxMixerView.cpp @@ -599,23 +599,25 @@ void FxMixerView::updateFaders() { const float opl = m_fxChannelViews[i]->m_fader->getPeak_L(); const float opr = m_fxChannelViews[i]->m_fader->getPeak_R(); - const float fallOff = 1.07; - if( m->effectChannel(i)->m_peakLeft > opl ) + const float fallOff = 1.25; + if( m->effectChannel(i)->m_peakLeft >= opl/fallOff ) { m_fxChannelViews[i]->m_fader->setPeak_L( m->effectChannel(i)->m_peakLeft ); - m->effectChannel(i)->m_peakLeft = 0; + // Set to -1 so later we'll know if this value has been refreshed yet. + m->effectChannel(i)->m_peakLeft = -1; } - else + else if( m->effectChannel(i)->m_peakLeft != -1 ) { m_fxChannelViews[i]->m_fader->setPeak_L( opl/fallOff ); } - if( m->effectChannel(i)->m_peakRight > opr ) + if( m->effectChannel(i)->m_peakRight >= opr/fallOff ) { m_fxChannelViews[i]->m_fader->setPeak_R( m->effectChannel(i)->m_peakRight ); - m->effectChannel(i)->m_peakRight = 0; + // Set to -1 so later we'll know if this value has been refreshed yet. + m->effectChannel(i)->m_peakRight = -1; } - else + else if( m->effectChannel(i)->m_peakRight != -1 ) { m_fxChannelViews[i]->m_fader->setPeak_R( opr/fallOff ); }