mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-24 15:48:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable-1.1'

Browse Source 
Conflicts:
	plugins/delay/delaycontrolsdialog.cpp
	plugins/delay/delayeffect.cpp
This commit is contained in:
Vesa committed 2014-11-26 14:10:00 +02:00
2 parents bdbedaddb9 c25cf8a5cf
commit ccf095a857
6 files changed
+7 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugins/delay/delayeffect.cpp
+2 -2
View File
@@ -83,7 +83,7 @@ bool DelayEffect::processAudioBuffer( sampleFrame* buf, const fpp_t frames )
const float d = dryLevel();
const float w = wetLevel();
const float length = m_delayControls.m_delayTimeModel.value() * Engine::mixer()->processingSampleRate();
m_lfo->setAmplitude( m_delayControls.m_lfoAmountModel.value() );
const float amplitude = m_delayControls.m_lfoAmountModel.value() * Engine::mixer()->processingSampleRate();
m_lfo->setFrequency( 1.0 / m_delayControls.m_lfoTimeModel.value() );
m_delay->setFeedback( m_delayControls.m_feedbackModel.value() );
sample_t dryS[2];
@@ -91,7 +91,7 @@ bool DelayEffect::processAudioBuffer( sampleFrame* buf, const fpp_t frames )
{
dryS[0] = buf[f][0];
dryS[1] = buf[f][1];
m_delay->setLength( ( float )length * ( float )m_lfo->tick() );
m_delay->setLength( ( float )length + ( amplitude * ( float )m_lfo->tick() ) );
m_delay->tick( buf[f] );
buf[f][0] = ( d * dryS[0] ) + ( w * buf[f][0] );