hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Some attention on peak controller

Browse Source
This commit is contained in:
Vesa
2014-10-31 17:46:11 +02:00
parent 8a596b0898
commit f207613d5f
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/PeakController.h
View File

@@ -61,7 +61,8 @@ public:
public slots:
virtual ControllerDialog * createDialog( QWidget * _parent );
void handleDestroyedEffect( );
void handleDestroyedEffect( );
void updateCoeffs();
protected:
// The internal per-controller get-value function
@@ -77,6 +78,10 @@ private:
static int m_getCount;
static int m_loadCount;
static bool m_buggedFile;
float m_attackCoeff;
float m_decayCoeff;
bool m_coeffNeedsUpdate;
} ;

2
plugins/peak_controller_effect/peak_controller_effect.cpp
View File

@@ -131,7 +131,7 @@ bool PeakControllerEffect::processAudioBuffer( sampleFrame * _buf,
float curRMS = sqrt_neg( sum / _frames );
const float amount = c.m_amountModel.value() * c.m_amountMultModel.value();
m_lastSample = c.m_baseModel.value() + amount * curRMS;
m_lastSample = qBound( 0.0f, c.m_baseModel.value() + amount * curRMS, 1.0f );
return isRunning();
}

35
src/core/PeakController.cpp
View File

@@ -60,6 +60,10 @@ PeakController::PeakController( Model * _parent,
connect( m_peakEffect, SIGNAL( destroyed( ) ),
this, SLOT( handleDestroyedEffect( ) ) );
}
connect( engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( updateCoeffs() ) );
connect( m_peakEffect->attackModel(), SIGNAL( dataChanged() ), this, SLOT( updateCoeffs() ) );
connect( m_peakEffect->decayModel(), SIGNAL( dataChanged() ), this, SLOT( updateCoeffs() ) );
m_coeffNeedsUpdate = true;
}
@@ -80,6 +84,14 @@ PeakController::~PeakController()
void PeakController::updateValueBuffer()
{
if( m_coeffNeedsUpdate )
{
const float ratio = 44100.0f / engine::mixer()->processingSampleRate();
m_attackCoeff = 1.0f - powf( 10.0f, -0.5f * ( 1.0f - m_peakEffect->attackModel()->value() ) * ratio );
m_decayCoeff = 1.0f - powf( 10.0f, -0.5f * ( 1.0f - m_peakEffect->decayModel()->value() ) * ratio );
m_coeffNeedsUpdate = false;
}
if( m_peakEffect )
{
float targetSample = m_peakEffect->lastSample();
@@ -87,24 +99,17 @@ void PeakController::updateValueBuffer()
{
const f_cnt_t frames = engine::mixer()->framesPerPeriod();
float * values = m_valueBuffer.values();
const float ratio = ( 44100.0 / 256.0 ) / engine::mixer()->processingSampleRate();
const float v = m_currentSample >= targetSample
? m_peakEffect->decayModel()->value()
: m_peakEffect->attackModel()->value();
const float diff = ( targetSample - m_currentSample ) * ratio;
const float a = ( 1.0f - sqrt_neg( sqrt_neg( v ) ) ) * diff;
const bool att = m_currentSample < targetSample;
for( f_cnt_t f = 0; f < frames; ++f )
{
if( att ) // going up...
const float diff = ( targetSample - m_currentSample );
if( m_currentSample < targetSample ) // going up...
{
m_currentSample = qMin( targetSample, m_currentSample + a ); // qmin prevents overshoot
m_currentSample += diff * m_attackCoeff;
}
else
else if( m_currentSample > targetSample ) // going down
{
m_currentSample = qMax( targetSample, m_currentSample + a ); // qmax prevents overshoot
m_currentSample += diff * m_decayCoeff;
}
values[f] = m_currentSample;
}
@@ -122,6 +127,12 @@ void PeakController::updateValueBuffer()
}
void PeakController::updateCoeffs()
{
m_coeffNeedsUpdate = true;
}
void PeakController::handleDestroyedEffect( )
{
// possible race condition...