Skip to content

Remove glitching from the Flanger and Delay plugins #3524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zonkmachine merged 1 commit into from
May 17, 2017
+20 −18
Merged

Remove glitching from the Flanger and Delay plugins #3524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions plugins/Delay/StereoDelay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ StereoDelay::StereoDelay( int maxTime, int sampleRate )
m_maxLength = maxTime * sampleRate;
m_length = m_maxLength;

m_index = 0;
m_writeIndex = 0;
m_feedback = 0.0f;
setSampleRate( sampleRate );
}
Expand All @@ -57,20 +57,22 @@ StereoDelay::~StereoDelay()

void StereoDelay::tick( sampleFrame frame )
{
m_index = ( int )m_length > 0
? ( m_index + 1 ) % ( int ) m_length
: m_index;
float lOut = m_buffer[ m_index ][ 0 ];
float rOut = m_buffer[ m_index ] [1 ];
m_buffer[ m_index ][ 0 ] = frame[ 0 ] + ( lOut * m_feedback );
m_buffer[ m_index ][ 1 ] = frame[ 1 ] + ( rOut * m_feedback );
m_writeIndex = ( m_writeIndex + 1 ) % ( int )m_maxLength;
int readIndex = m_writeIndex - m_length;
if (readIndex < 0 ) { readIndex += m_maxLength; }
float lOut = m_buffer[ readIndex ][ 0 ];
float rOut = m_buffer[ readIndex ] [1 ];
m_buffer[ m_writeIndex ][ 0 ] = frame[ 0 ] + ( lOut * m_feedback );
m_buffer[ m_writeIndex ][ 1 ] = frame[ 1 ] + ( rOut * m_feedback );
frame[ 0 ] = lOut;
frame[ 1 ] = rOut;
}






void StereoDelay::setSampleRate( int sampleRate )
{
if( m_buffer )
Expand Down
2 changes: 1 addition & 1 deletion plugins/Delay/StereoDelay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class StereoDelay
sampleFrame* m_buffer;
int m_maxLength;
float m_length;
int m_index;
int m_writeIndex;
float m_feedback;
float m_maxTime;
};
Expand Down
4 changes: 2 additions & 2 deletions plugins/Flanger/FlangerEffect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ bool FlangerEffect::processAudioBuffer( sampleFrame *buf, const fpp_t frames )
dryS[0] = buf[f][0];
dryS[1] = buf[f][1];
m_lfo->tick(&leftLfo, &rightLfo);
m_lDelay->setLength( ( float )length + ( amplitude * leftLfo ) );
m_rDelay->setLength( ( float )length+ ( amplitude * rightLfo ) );
m_lDelay->setLength( ( float )length + amplitude * (leftLfo+1.0) );
m_rDelay->setLength( ( float )length + amplitude * (rightLfo+1.0) );
if(invertFeedback)
{
m_lDelay->tick( &buf[f][1] );
Expand Down
12 changes: 6 additions & 6 deletions plugins/Flanger/MonoDelay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MonoDelay::MonoDelay( int maxTime , int sampleRate )
m_maxLength = maxTime * sampleRate;
m_length = m_maxLength;

m_index = 0;
m_writeIndex = 0;
m_feedback = 0.0f;
setSampleRate( sampleRate );
}
Expand All @@ -54,11 +54,11 @@ MonoDelay::~MonoDelay()

void MonoDelay::tick( sample_t* sample )
{
m_index = ( int )m_length > 0
? ( m_index + 1 ) % ( int )m_length
: m_index;
float out = m_buffer[ m_index ];
m_buffer[ m_index ] = *sample + ( out * m_feedback );
m_writeIndex = ( m_writeIndex + 1 ) % ( int )m_maxLength;
int readIndex = m_writeIndex - m_length;
if (readIndex < 0 ) { readIndex += m_maxLength; }
float out = m_buffer[ readIndex ];
m_buffer[ m_writeIndex ] = *sample + ( out * m_feedback );
*sample = out;
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/Flanger/MonoDelay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class MonoDelay
sample_t* m_buffer;
int m_maxLength;
float m_length;
int m_index;
int m_writeIndex;
float m_feedback;
float m_maxTime;
};
Expand Down