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

Merge pull request #1809 from curlymorphic/dataChanged

Browse Source 
Added sample exactness to the Lfo controller controls
This commit is contained in:
Vesa V
2015-03-08 10:55:05 +02:00
parent 07e422c66d d15a1136de
commit 67199970a5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/LfoController.cpp
View File

@@ -98,6 +98,10 @@ void LfoController::updateValueBuffer()
m_bufferLastUpdated += diff;
}
float amount = m_amountModel.value();
ValueBuffer *amountBuffer = m_amountModel.valueBuffer();
int amountInc = amountBuffer ? 1 : 0;
float *amountPtr = amountBuffer ? &(amountBuffer->values()[ 0 ] ) : &amount;
for( int i = 0; i < m_valueBuffer.length(); i++ )
{
@@ -105,15 +109,15 @@ void LfoController::updateValueBuffer()
? m_sampleFunction( phase )
: m_userDefSampleBuffer->userWaveSample( phase );
values[i] = qBound( 0.0f, m_baseModel.value() + ( m_amountModel.value() * currentSample / 2.0f ), 1.0f );
values[i] = qBound( 0.0f, m_baseModel.value() + ( *amountPtr * currentSample / 2.0f ), 1.0f );
phase += 1.0 / m_duration;
amountPtr += amountInc;
}
m_currentPhase = absFraction( phase - m_phaseOffset );
}
void LfoController::updatePhase()
{
m_currentPhase = ( Engine::getSong()->getFrames() ) / m_duration;