From b982fa4b4c5df049eea4f3098824a421b456b97e Mon Sep 17 00:00:00 2001
From: Dave French <dave.french3@googlemail.com>
Date: Mon, 22 Dec 2014 22:22:51 +0000
Subject: [PATCH 1/4] Flanger correct interpolate calculation

---
 plugins/flanger/monodelay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/flanger/monodelay.cpp b/plugins/flanger/monodelay.cpp
index 4d1fdaa4c..74e884642 100644
--- a/plugins/flanger/monodelay.cpp
+++ b/plugins/flanger/monodelay.cpp
@@ -60,7 +60,7 @@ void MonoDelay::tick( sample_t* sample )
     {
         readIndex += m_maxLength;
     }
-    float fract = fraction( m_length );
+	float fract = 1.0f - fraction( m_length );
     if(readIndex != m_maxLength-1 )
     {
     *sample = linearInterpolate(m_buffer[readIndex] ,

From 7f47fc955d20f6f5ca6131f24182baf1eb7bdfb7 Mon Sep 17 00:00:00 2001
From: Dave French <dave.french3@googlemail.com>
Date: Mon, 22 Dec 2014 22:25:55 +0000
Subject: [PATCH 2/4] Flanger reformat, convert spaces to tabs

---
 plugins/flanger/flangercontrols.cpp     |  44 +++----
 plugins/flanger/flangercontrols.h       |  58 ++++-----
 plugins/flanger/flangercontrolsdialog.h |   8 +-
 plugins/flanger/flangereffect.cpp       | 152 ++++++++++++------------
 plugins/flanger/flangereffect.h         |  26 ++--
 plugins/flanger/monodelay.cpp           |  66 +++++-----
 plugins/flanger/monodelay.h             |  42 +++----
 plugins/flanger/noise.cpp               |   4 +-
 plugins/flanger/noise.h                 |   6 +-
 plugins/flanger/quadraturelfo.cpp       |   8 +-
 plugins/flanger/quadraturelfo.h         |  58 ++++-----
 11 files changed, 236 insertions(+), 236 deletions(-)

diff --git a/plugins/flanger/flangercontrols.cpp b/plugins/flanger/flangercontrols.cpp
index 55d7f215c..52e2d0a87 100644
--- a/plugins/flanger/flangercontrols.cpp
+++ b/plugins/flanger/flangercontrols.cpp
@@ -32,17 +32,17 @@
 
 
 FlangerControls::FlangerControls( FlangerEffect *effect ) :
-    EffectControls ( effect ),
-    m_effect ( effect ),
-    m_delayTimeModel(0.001, 0.0001, 0.050, 0.0001,  this, tr( "Delay Samples" ) ) ,
-    m_lfoFrequencyModel( 0.25, 0.01, 5, 0.0001, 20000.0 ,this, tr( "Lfo Frequency" ) ),
-    m_lfoAmountModel( 0.0, 0.0, 0.0025 , 0.0001 , this , tr( "Seconds" ) ),
-    m_feedbackModel( 0.0 , 0.0 , 1.0 , 0.0001, this, tr( "Regen" ) ),
-    m_whiteNoiseAmountModel( 0.0 , 0.0 , 0.05 , 0.0001, this, tr( "Noise" ) ),
-    m_invertFeedbackModel ( false , this, tr( "Invert" ) )
+	EffectControls ( effect ),
+	m_effect ( effect ),
+	m_delayTimeModel(0.001, 0.0001, 0.050, 0.0001,  this, tr( "Delay Samples" ) ) ,
+	m_lfoFrequencyModel( 0.25, 0.01, 5, 0.0001, 20000.0 ,this, tr( "Lfo Frequency" ) ),
+	m_lfoAmountModel( 0.0, 0.0, 0.0025 , 0.0001 , this , tr( "Seconds" ) ),
+	m_feedbackModel( 0.0 , 0.0 , 1.0 , 0.0001, this, tr( "Regen" ) ),
+	m_whiteNoiseAmountModel( 0.0 , 0.0 , 0.05 , 0.0001, this, tr( "Noise" ) ),
+	m_invertFeedbackModel ( false , this, tr( "Invert" ) )
 
 {
-    connect( Engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( changedSampleRate() ) );
+	connect( Engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( changedSampleRate() ) );
 }
 
 
@@ -50,12 +50,12 @@ FlangerControls::FlangerControls( FlangerEffect *effect ) :
 
 void FlangerControls::loadSettings( const QDomElement &_this )
 {
-    m_delayTimeModel.loadSettings( _this, "DelayTimeSamples" );
-    m_lfoFrequencyModel.loadSettings( _this, "LfoFrequency" );
-    m_lfoAmountModel.loadSettings( _this, "LfoAmount" );
-    m_feedbackModel.loadSettings( _this, "Feedback" );
-    m_whiteNoiseAmountModel.loadSettings( _this, "WhiteNoise" );
-    m_invertFeedbackModel.loadSettings( _this, "Invert" );
+	m_delayTimeModel.loadSettings( _this, "DelayTimeSamples" );
+	m_lfoFrequencyModel.loadSettings( _this, "LfoFrequency" );
+	m_lfoAmountModel.loadSettings( _this, "LfoAmount" );
+	m_feedbackModel.loadSettings( _this, "Feedback" );
+	m_whiteNoiseAmountModel.loadSettings( _this, "WhiteNoise" );
+	m_invertFeedbackModel.loadSettings( _this, "Invert" );
 
 }
 
@@ -64,12 +64,12 @@ void FlangerControls::loadSettings( const QDomElement &_this )
 
 void FlangerControls::saveSettings( QDomDocument &doc, QDomElement &parent )
 {
-    m_delayTimeModel.saveSettings( doc , parent, "DelayTimeSamples" );
-    m_lfoFrequencyModel.saveSettings( doc, parent , "LfoFrequency" );
-    m_lfoAmountModel.saveSettings( doc, parent , "LfoAmount" );
-    m_feedbackModel.saveSettings( doc, parent, "Feedback" ) ;
-    m_whiteNoiseAmountModel.saveSettings( doc, parent , "WhiteNoise" ) ;
-    m_invertFeedbackModel.saveSettings( doc, parent, "Invert" );
+	m_delayTimeModel.saveSettings( doc , parent, "DelayTimeSamples" );
+	m_lfoFrequencyModel.saveSettings( doc, parent , "LfoFrequency" );
+	m_lfoAmountModel.saveSettings( doc, parent , "LfoAmount" );
+	m_feedbackModel.saveSettings( doc, parent, "Feedback" ) ;
+	m_whiteNoiseAmountModel.saveSettings( doc, parent , "WhiteNoise" ) ;
+	m_invertFeedbackModel.saveSettings( doc, parent, "Invert" );
 }
 
 
@@ -77,7 +77,7 @@ void FlangerControls::saveSettings( QDomDocument &doc, QDomElement &parent )
 
 void FlangerControls::changedSampleRate()
 {
-    m_effect->changeSampleRate();
+	m_effect->changeSampleRate();
 }
 
 
diff --git a/plugins/flanger/flangercontrols.h b/plugins/flanger/flangercontrols.h
index bbd52dbee..bd0f43742 100644
--- a/plugins/flanger/flangercontrols.h
+++ b/plugins/flanger/flangercontrols.h
@@ -34,41 +34,41 @@ class FlangerEffect;
 
 class FlangerControls : public EffectControls
 {
-    Q_OBJECT
+	Q_OBJECT
 public:
-    FlangerControls( FlangerEffect* effect );
-    virtual ~FlangerControls()
-    {
-    }
-    virtual void saveSettings ( QDomDocument& doc, QDomElement& parent );
-    virtual void loadSettings ( const QDomElement &_this );
-    inline virtual QString nodeName() const
-    {
-        return "Flanger";
-    }
-    virtual int controlCount()
-    {
-        return 5;
-    }
-    virtual EffectControlDialog* createView()
-    {
-        return new FlangerControlsDialog( this );
-    }
+	FlangerControls( FlangerEffect* effect );
+	virtual ~FlangerControls()
+	{
+	}
+	virtual void saveSettings ( QDomDocument& doc, QDomElement& parent );
+	virtual void loadSettings ( const QDomElement &_this );
+	inline virtual QString nodeName() const
+	{
+		return "Flanger";
+	}
+	virtual int controlCount()
+	{
+		return 5;
+	}
+	virtual EffectControlDialog* createView()
+	{
+		return new FlangerControlsDialog( this );
+	}
 
 private slots:
-    void changedSampleRate();
+	void changedSampleRate();
 
 private:
-    FlangerEffect* m_effect;
-    FloatModel m_delayTimeModel;
-    TempoSyncKnobModel m_lfoFrequencyModel;
-    FloatModel m_lfoAmountModel;
-    FloatModel m_feedbackModel;
-    FloatModel m_whiteNoiseAmountModel;
-    BoolModel m_invertFeedbackModel;
+	FlangerEffect* m_effect;
+	FloatModel m_delayTimeModel;
+	TempoSyncKnobModel m_lfoFrequencyModel;
+	FloatModel m_lfoAmountModel;
+	FloatModel m_feedbackModel;
+	FloatModel m_whiteNoiseAmountModel;
+	BoolModel m_invertFeedbackModel;
 
-    friend class FlangerControlsDialog;
-    friend class FlangerEffect;
+	friend class FlangerControlsDialog;
+	friend class FlangerEffect;
 
 };
 
diff --git a/plugins/flanger/flangercontrolsdialog.h b/plugins/flanger/flangercontrolsdialog.h
index bdfa90d45..1fef65a3e 100644
--- a/plugins/flanger/flangercontrolsdialog.h
+++ b/plugins/flanger/flangercontrolsdialog.h
@@ -32,10 +32,10 @@ class FlangerControls;
 class FlangerControlsDialog : public EffectControlDialog
 {
 public:
-    FlangerControlsDialog( FlangerControls* controls );
-    virtual ~FlangerControlsDialog()
-    {
-    }
+	FlangerControlsDialog( FlangerControls* controls );
+	virtual ~FlangerControlsDialog()
+	{
+	}
 };
 
 #endif // FLANGERCONTROLSDIALOG_H
diff --git a/plugins/flanger/flangereffect.cpp b/plugins/flanger/flangereffect.cpp
index a309e38c9..fcaadfca7 100644
--- a/plugins/flanger/flangereffect.cpp
+++ b/plugins/flanger/flangereffect.cpp
@@ -31,28 +31,28 @@ extern "C"
 
 Plugin::Descriptor PLUGIN_EXPORT flanger_plugin_descriptor =
 {
-    STRINGIFY( PLUGIN_NAME ),
-    "Flanger",
-    QT_TRANSLATE_NOOP( "pluginBrowser", "A native flanger plugin" ),
-    "Dave French <contact/dot/dave/dot/french3/at/googlemail/dot/com>",
-    0x0100,
-    Plugin::Effect,
-    new PluginPixmapLoader( "logo" ),
-    NULL,
-    NULL
+	STRINGIFY( PLUGIN_NAME ),
+	"Flanger",
+	QT_TRANSLATE_NOOP( "pluginBrowser", "A native flanger plugin" ),
+	"Dave French <contact/dot/dave/dot/french3/at/googlemail/dot/com>",
+	0x0100,
+	Plugin::Effect,
+	new PluginPixmapLoader( "logo" ),
+	NULL,
+	NULL
 } ;
 
 
 
 
 FlangerEffect::FlangerEffect( Model *parent, const Plugin::Descriptor::SubPluginFeatures::Key *key ) :
-    Effect( &flanger_plugin_descriptor, parent, key ),
-    m_flangerControls( this )
+	Effect( &flanger_plugin_descriptor, parent, key ),
+	m_flangerControls( this )
 {
-    m_lfo = new QuadratureLfo( Engine::mixer()->processingSampleRate() );
-    m_lDelay = new MonoDelay( 1, Engine::mixer()->processingSampleRate() );
-    m_rDelay = new MonoDelay( 1, Engine::mixer()->processingSampleRate() );
-    m_noise = new Noise;
+	m_lfo = new QuadratureLfo( Engine::mixer()->processingSampleRate() );
+	m_lDelay = new MonoDelay( 1, Engine::mixer()->processingSampleRate() );
+	m_rDelay = new MonoDelay( 1, Engine::mixer()->processingSampleRate() );
+	m_noise = new Noise;
 }
 
 
@@ -60,22 +60,22 @@ FlangerEffect::FlangerEffect( Model *parent, const Plugin::Descriptor::SubPlugin
 
 FlangerEffect::~FlangerEffect()
 {
-    if(m_lDelay )
-    {
-        delete m_lDelay;
-    }
-    if( m_rDelay )
-    {
-        delete m_rDelay;
-    }
-    if(m_lfo )
-    {
-        delete m_lfo;
-    }
-    if(m_noise)
-    {
-        delete m_noise;
-    }
+	if(m_lDelay )
+	{
+		delete m_lDelay;
+	}
+	if( m_rDelay )
+	{
+		delete m_rDelay;
+	}
+	if(m_lfo )
+	{
+		delete m_lfo;
+	}
+	if(m_noise)
+	{
+		delete m_noise;
+	}
 }
 
 
@@ -83,48 +83,48 @@ FlangerEffect::~FlangerEffect()
 
 bool FlangerEffect::processAudioBuffer( sampleFrame *buf, const fpp_t frames )
 {
-    if( !isEnabled() || !isRunning () )
-    {
-        return( false );
-    }
-    double outSum = 0.0;
-    const float d = dryLevel();
-    const float w = wetLevel();
-    const float length = m_flangerControls.m_delayTimeModel.value() * Engine::mixer()->processingSampleRate();
-    const float noise = m_flangerControls.m_whiteNoiseAmountModel.value();
-    float amplitude = m_flangerControls.m_lfoAmountModel.value() * Engine::mixer()->processingSampleRate();
-    bool invertFeedback = m_flangerControls.m_invertFeedbackModel.value();
-    m_lfo->setFrequency(  m_flangerControls.m_lfoFrequencyModel.value() );
-    m_lDelay->setFeedback( m_flangerControls.m_feedbackModel.value() );
-    m_rDelay->setFeedback( m_flangerControls.m_feedbackModel.value() );
-    sample_t dryS[2];
-    float leftLfo;
-    float rightLfo;
-    for( fpp_t f = 0; f < frames; ++f )
-    {
-        buf[f][0] += m_noise->tick() * noise;
-        buf[f][1] += m_noise->tick() * noise;
-        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 ) );
-        if(invertFeedback)
-        {
-            m_lDelay->tick( &buf[f][1] );
-            m_rDelay->tick(&buf[f][0] );
-        } else
-        {
-            m_lDelay->tick( &buf[f][0] );
-            m_rDelay->tick( &buf[f][1] );
-        }
+	if( !isEnabled() || !isRunning () )
+	{
+		return( false );
+	}
+	double outSum = 0.0;
+	const float d = dryLevel();
+	const float w = wetLevel();
+	const float length = m_flangerControls.m_delayTimeModel.value() * Engine::mixer()->processingSampleRate();
+	const float noise = m_flangerControls.m_whiteNoiseAmountModel.value();
+	float amplitude = m_flangerControls.m_lfoAmountModel.value() * Engine::mixer()->processingSampleRate();
+	bool invertFeedback = m_flangerControls.m_invertFeedbackModel.value();
+	m_lfo->setFrequency(  m_flangerControls.m_lfoFrequencyModel.value() );
+	m_lDelay->setFeedback( m_flangerControls.m_feedbackModel.value() );
+	m_rDelay->setFeedback( m_flangerControls.m_feedbackModel.value() );
+	sample_t dryS[2];
+	float leftLfo;
+	float rightLfo;
+	for( fpp_t f = 0; f < frames; ++f )
+	{
+		buf[f][0] += m_noise->tick() * noise;
+		buf[f][1] += m_noise->tick() * noise;
+		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 ) );
+		if(invertFeedback)
+		{
+			m_lDelay->tick( &buf[f][1] );
+			m_rDelay->tick(&buf[f][0] );
+		} else
+		{
+			m_lDelay->tick( &buf[f][0] );
+			m_rDelay->tick( &buf[f][1] );
+		}
 
-        buf[f][0] = ( d * dryS[0] ) + ( w * buf[f][0] );
-        buf[f][1] = ( d * dryS[1] ) + ( w * buf[f][1] );
-        outSum += buf[f][0]*buf[f][0] + buf[f][1]*buf[f][1];
-    }
-    checkGate( outSum / frames );
-    return isRunning();
+		buf[f][0] = ( d * dryS[0] ) + ( w * buf[f][0] );
+		buf[f][1] = ( d * dryS[1] ) + ( w * buf[f][1] );
+		outSum += buf[f][0]*buf[f][0] + buf[f][1]*buf[f][1];
+	}
+	checkGate( outSum / frames );
+	return isRunning();
 }
 
 
@@ -132,9 +132,9 @@ bool FlangerEffect::processAudioBuffer( sampleFrame *buf, const fpp_t frames )
 
 void FlangerEffect::changeSampleRate()
 {
-    m_lfo->setSampleRate( Engine::mixer()->processingSampleRate() );
-    m_lDelay->setSampleRate( Engine::mixer()->processingSampleRate() );
-    m_rDelay->setSampleRate( Engine::mixer()->processingSampleRate() );
+	m_lfo->setSampleRate( Engine::mixer()->processingSampleRate() );
+	m_lDelay->setSampleRate( Engine::mixer()->processingSampleRate() );
+	m_rDelay->setSampleRate( Engine::mixer()->processingSampleRate() );
 }
 
 
@@ -145,7 +145,7 @@ extern "C"
 //needed for getting plugin out of shared lib
 Plugin * PLUGIN_EXPORT lmms_plugin_main( Model* parent, void* data )
 {
-    return new FlangerEffect( parent , static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
+	return new FlangerEffect( parent , static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>( data ) );
 }
 
 }}
diff --git a/plugins/flanger/flangereffect.h b/plugins/flanger/flangereffect.h
index d476a056a..04f308249 100644
--- a/plugins/flanger/flangereffect.h
+++ b/plugins/flanger/flangereffect.h
@@ -36,21 +36,21 @@
 class FlangerEffect : public Effect
 {
 public:
-    FlangerEffect( Model* parent , const Descriptor::SubPluginFeatures::Key* key );
-    virtual ~FlangerEffect();
-    virtual bool processAudioBuffer( sampleFrame *buf, const fpp_t frames );
-    virtual EffectControls* controls()
-    {
-        return &m_flangerControls;
-    }
-    void changeSampleRate();
+	FlangerEffect( Model* parent , const Descriptor::SubPluginFeatures::Key* key );
+	virtual ~FlangerEffect();
+	virtual bool processAudioBuffer( sampleFrame *buf, const fpp_t frames );
+	virtual EffectControls* controls()
+	{
+		return &m_flangerControls;
+	}
+	void changeSampleRate();
 
 private:
-    FlangerControls m_flangerControls;
-    MonoDelay* m_lDelay;
-    MonoDelay* m_rDelay;
-    QuadratureLfo* m_lfo;
-    Noise* m_noise;
+	FlangerControls m_flangerControls;
+	MonoDelay* m_lDelay;
+	MonoDelay* m_rDelay;
+	QuadratureLfo* m_lfo;
+	Noise* m_noise;
 
 };
 
diff --git a/plugins/flanger/monodelay.cpp b/plugins/flanger/monodelay.cpp
index 74e884642..ebb5b322d 100644
--- a/plugins/flanger/monodelay.cpp
+++ b/plugins/flanger/monodelay.cpp
@@ -28,14 +28,14 @@
 
 MonoDelay::MonoDelay( int maxTime , int sampleRate )
 {
-    m_buffer = 0;
-    m_maxTime = maxTime;
-    m_maxLength = maxTime * sampleRate;
-    m_length = m_maxLength;
+	m_buffer = 0;
+	m_maxTime = maxTime;
+	m_maxLength = maxTime * sampleRate;
+	m_length = m_maxLength;
 
-    m_index = 0;
-    m_feedback = 0.0f;
-    setSampleRate( sampleRate );
+	m_index = 0;
+	m_feedback = 0.0f;
+	setSampleRate( sampleRate );
 }
 
 
@@ -43,10 +43,10 @@ MonoDelay::MonoDelay( int maxTime , int sampleRate )
 
 MonoDelay::~MonoDelay()
 {
-    if( m_buffer )
-    {
-        delete m_buffer;
-    }
+	if( m_buffer )
+	{
+		delete m_buffer;
+	}
 }
 
 
@@ -54,24 +54,24 @@ MonoDelay::~MonoDelay()
 
 void MonoDelay::tick( sample_t* sample )
 {
-    m_buffer[m_index] = *sample;
-    int readIndex = m_index - ( int )m_length;
-    if(readIndex < 0)
-    {
-        readIndex += m_maxLength;
-    }
+	m_buffer[m_index] = *sample;
+	int readIndex = m_index - ( int )m_length;
+	if(readIndex < 0)
+	{
+		readIndex += m_maxLength;
+	}
 	float fract = 1.0f - fraction( m_length );
-    if(readIndex != m_maxLength-1 )
-    {
-    *sample = linearInterpolate(m_buffer[readIndex] ,
-                               m_buffer[readIndex+1], fract );
-    } else
-    {
-        *sample = linearInterpolate(m_buffer[readIndex] ,
-                                   m_buffer[0], fract );
-    }
-    m_buffer[m_index] += *sample * m_feedback;
-    m_index = ( m_index +1 ) % m_maxLength;
+	if(readIndex != m_maxLength-1 )
+	{
+		*sample = linearInterpolate(m_buffer[readIndex] ,
+									m_buffer[readIndex+1], fract );
+	} else
+	{
+		*sample = linearInterpolate(m_buffer[readIndex] ,
+									m_buffer[0], fract );
+	}
+	m_buffer[m_index] += *sample * m_feedback;
+	m_index = ( m_index +1 ) % m_maxLength;
 }
 
 
@@ -79,11 +79,11 @@ void MonoDelay::tick( sample_t* sample )
 
 void MonoDelay::setSampleRate( int sampleRate )
 {
-    if( m_buffer )
-    {
-        delete m_buffer;
-    }
+	if( m_buffer )
+	{
+		delete m_buffer;
+	}
 
 
-    m_buffer = new sample_t[( int )( sampleRate * m_maxTime )];
+	m_buffer = new sample_t[( int )( sampleRate * m_maxTime )];
 }
diff --git a/plugins/flanger/monodelay.h b/plugins/flanger/monodelay.h
index 8c544fd6c..866c5e697 100644
--- a/plugins/flanger/monodelay.h
+++ b/plugins/flanger/monodelay.h
@@ -30,31 +30,31 @@
 class MonoDelay
 {
 public:
-    MonoDelay( int maxTime , int sampleRate );
-    ~MonoDelay();
-    inline void setLength( float length )
-    {
-        if( length <= m_maxLength && length >= 0 )
-        {
-            m_length = length;
-        }
-    }
+	MonoDelay( int maxTime , int sampleRate );
+	~MonoDelay();
+	inline void setLength( float length )
+	{
+		if( length <= m_maxLength && length >= 0 )
+		{
+			m_length = length;
+		}
+	}
 
-    inline void setFeedback( float feedback )
-    {
-        m_feedback = feedback;
-    }
+	inline void setFeedback( float feedback )
+	{
+		m_feedback = feedback;
+	}
 
-    void tick( sample_t* sample );
-    void setSampleRate( int sampleRate );
+	void tick( sample_t* sample );
+	void setSampleRate( int sampleRate );
 
 private:
-    sample_t* m_buffer;
-    int m_maxLength;
-    float m_length;
-    int m_index;
-    float m_feedback;
-    float m_maxTime;
+	sample_t* m_buffer;
+	int m_maxLength;
+	float m_length;
+	int m_index;
+	float m_feedback;
+	float m_maxTime;
 };
 
 #endif // MONODELAY_H
diff --git a/plugins/flanger/noise.cpp b/plugins/flanger/noise.cpp
index bd0d84b98..2c4606381 100644
--- a/plugins/flanger/noise.cpp
+++ b/plugins/flanger/noise.cpp
@@ -27,7 +27,7 @@
 
 Noise::Noise()
 {
-    inv_randmax = 1.0/FAST_RAND_MAX; /* for range of 0 - 1.0 */
+	inv_randmax = 1.0/FAST_RAND_MAX; /* for range of 0 - 1.0 */
 }
 
 
@@ -35,5 +35,5 @@ Noise::Noise()
 
 float Noise::tick()
 {
-    return (float) ((2.0 * fast_rand() * inv_randmax) - 1.0);
+	return (float) ((2.0 * fast_rand() * inv_randmax) - 1.0);
 }
diff --git a/plugins/flanger/noise.h b/plugins/flanger/noise.h
index 008700ed7..ea0a854bd 100644
--- a/plugins/flanger/noise.h
+++ b/plugins/flanger/noise.h
@@ -28,10 +28,10 @@
 class Noise
 {
 public:
-    Noise();
-    float tick();
+	Noise();
+	float tick();
 private:
-     double inv_randmax;
+	double inv_randmax;
 };
 
 #endif // NOISE_H
diff --git a/plugins/flanger/quadraturelfo.cpp b/plugins/flanger/quadraturelfo.cpp
index 1e4d7d0f1..49e8299ad 100644
--- a/plugins/flanger/quadraturelfo.cpp
+++ b/plugins/flanger/quadraturelfo.cpp
@@ -26,13 +26,13 @@
 
 QuadratureLfo::QuadratureLfo( int sampleRate )
 {
-    setSampleRate(sampleRate);
+	setSampleRate(sampleRate);
 }
 
 void QuadratureLfo::tick( float *s, float *c )
 {
-    *s = sinf( m_phase );
-    *c = cosf( m_phase );
-    m_phase += m_increment;
+	*s = sinf( m_phase );
+	*c = cosf( m_phase );
+	m_phase += m_increment;
 
 }
diff --git a/plugins/flanger/quadraturelfo.h b/plugins/flanger/quadraturelfo.h
index f884f691c..04f2e62df 100644
--- a/plugins/flanger/quadraturelfo.h
+++ b/plugins/flanger/quadraturelfo.h
@@ -30,44 +30,44 @@
 class QuadratureLfo
 {
 public:
-    QuadratureLfo( int sampleRate );
-    ~QuadratureLfo()
-    {
-    }
+	QuadratureLfo( int sampleRate );
+	~QuadratureLfo()
+	{
+	}
 
-    inline void setFrequency( double frequency )
-    {
-        if( frequency < 0 || frequency > ( m_samplerate / 2.0 ) || frequency == m_frequency )
-        {
-            return;
-        }
-        m_frequency = frequency;
-        m_increment = m_frequency * m_twoPiOverSr;
+	inline void setFrequency( double frequency )
+	{
+		if( frequency < 0 || frequency > ( m_samplerate / 2.0 ) || frequency == m_frequency )
+		{
+			return;
+		}
+		m_frequency = frequency;
+		m_increment = m_frequency * m_twoPiOverSr;
 
-        if( m_phase >= F_2PI )
-        {
-            m_phase -= F_2PI;
-        }
-    }
+		if( m_phase >= F_2PI )
+		{
+			m_phase -= F_2PI;
+		}
+	}
 
 
 
 
-    inline void setSampleRate ( int samplerate )
-    {
-        m_samplerate = samplerate;
-        m_twoPiOverSr = F_2PI / samplerate;
-        m_increment = m_frequency * m_twoPiOverSr;
-    }
+	inline void setSampleRate ( int samplerate )
+	{
+		m_samplerate = samplerate;
+		m_twoPiOverSr = F_2PI / samplerate;
+		m_increment = m_frequency * m_twoPiOverSr;
+	}
 
-    void tick( float *s, float *c );
+	void tick( float *s, float *c );
 
 private:
-    double m_frequency;
-    double m_phase;
-    double m_increment;
-    double m_twoPiOverSr;
-    int m_samplerate;
+	double m_frequency;
+	double m_phase;
+	double m_increment;
+	double m_twoPiOverSr;
+	int m_samplerate;
 
 };
 

From eca59c30eb9df6a000f3297ba29d66926cf16c7c Mon Sep 17 00:00:00 2001
From: Dave French <dave.french3@googlemail.com>
Date: Mon, 22 Dec 2014 22:52:47 +0000
Subject: [PATCH 3/4] Flanger change Filenames to CamelCase

---
 plugins/CMakeLists.txt                              |   2 +-
 plugins/Flanger/CMakeLists.txt                      |   3 +++
 .../FlangerControls.cpp}                            |   4 ++--
 .../flangercontrols.h => Flanger/FlangerControls.h} |   2 +-
 .../FlangerControlsDialog.cpp}                      |   4 ++--
 .../FlangerControlsDialog.h}                        |   0
 .../flangereffect.cpp => Flanger/FlangerEffect.cpp} |   2 +-
 .../flangereffect.h => Flanger/FlangerEffect.h}     |   8 ++++----
 .../monodelay.cpp => Flanger/MonoDelay.cpp}         |   2 +-
 .../{flanger/monodelay.h => Flanger/MonoDelay.h}    |   0
 plugins/{flanger/noise.cpp => Flanger/Noise.cpp}    |   2 +-
 plugins/{flanger/noise.h => Flanger/Noise.h}        |   0
 .../quadraturelfo.cpp => Flanger/QuadratureLfo.cpp} |   2 +-
 .../quadraturelfo.h => Flanger/QuadratureLfo.h}     |   0
 plugins/{flanger => Flanger}/artwork.png            | Bin
 plugins/{flanger => Flanger}/logo.png               | Bin
 plugins/flanger/CMakeLists.txt                      |   3 ---
 17 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 plugins/Flanger/CMakeLists.txt
 rename plugins/{flanger/flangercontrols.cpp => Flanger/FlangerControls.cpp} (97%)
 rename plugins/{flanger/flangercontrols.h => Flanger/FlangerControls.h} (98%)
 rename plugins/{flanger/flangercontrolsdialog.cpp => Flanger/FlangerControlsDialog.cpp} (97%)
 rename plugins/{flanger/flangercontrolsdialog.h => Flanger/FlangerControlsDialog.h} (100%)
 rename plugins/{flanger/flangereffect.cpp => Flanger/FlangerEffect.cpp} (99%)
 rename plugins/{flanger/flangereffect.h => Flanger/FlangerEffect.h} (93%)
 rename plugins/{flanger/monodelay.cpp => Flanger/MonoDelay.cpp} (98%)
 rename plugins/{flanger/monodelay.h => Flanger/MonoDelay.h} (100%)
 rename plugins/{flanger/noise.cpp => Flanger/Noise.cpp} (98%)
 rename plugins/{flanger/noise.h => Flanger/Noise.h} (100%)
 rename plugins/{flanger/quadraturelfo.cpp => Flanger/QuadratureLfo.cpp} (97%)
 rename plugins/{flanger/quadraturelfo.h => Flanger/QuadratureLfo.h} (100%)
 rename plugins/{flanger => Flanger}/artwork.png (100%)
 rename plugins/{flanger => Flanger}/logo.png (100%)
 delete mode 100644 plugins/flanger/CMakeLists.txt

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 63c80538e..d7b4cf11e 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -11,7 +11,7 @@ ADD_SUBDIRECTORY(delay)
 ADD_SUBDIRECTORY(DualFilter)
 ADD_SUBDIRECTORY(dynamics_processor)
 ADD_SUBDIRECTORY(Eq)
-ADD_SUBDIRECTORY(flanger)
+ADD_SUBDIRECTORY(Flanger)
 ADD_SUBDIRECTORY(flp_import)
 ADD_SUBDIRECTORY(HydrogenImport)
 ADD_SUBDIRECTORY(kicker)
diff --git a/plugins/Flanger/CMakeLists.txt b/plugins/Flanger/CMakeLists.txt
new file mode 100644
index 000000000..c3febd094
--- /dev/null
+++ b/plugins/Flanger/CMakeLists.txt
@@ -0,0 +1,3 @@
+INCLUDE(BuildPlugin)
+
+BUILD_PLUGIN(flanger FlangerEffect.cpp FlangerControls.cpp FlangerControlsDialog.cpp Noise.cpp QuadratureLfo.cpp MonoDelay.cpp MOCFILES FlangerControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
diff --git a/plugins/flanger/flangercontrols.cpp b/plugins/Flanger/FlangerControls.cpp
similarity index 97%
rename from plugins/flanger/flangercontrols.cpp
rename to plugins/Flanger/FlangerControls.cpp
index 52e2d0a87..34d2b8f52 100644
--- a/plugins/flanger/flangercontrols.cpp
+++ b/plugins/Flanger/FlangerControls.cpp
@@ -24,8 +24,8 @@
 
 #include <QtXml/QDomElement>
 
-#include "flangercontrols.h"
-#include "flangereffect.h"
+#include "FlangerControls.h"
+#include "FlangerEffect.h"
 #include "Engine.h"
 #include "Song.h"
 
diff --git a/plugins/flanger/flangercontrols.h b/plugins/Flanger/FlangerControls.h
similarity index 98%
rename from plugins/flanger/flangercontrols.h
rename to plugins/Flanger/FlangerControls.h
index bd0f43742..29f5a5aaf 100644
--- a/plugins/flanger/flangercontrols.h
+++ b/plugins/Flanger/FlangerControls.h
@@ -27,7 +27,7 @@
 
 #include "EffectControls.h"
 #include "Knob.h"
-#include "flangercontrolsdialog.h"
+#include "FlangerControlsDialog.h"
 
 
 class FlangerEffect;
diff --git a/plugins/flanger/flangercontrolsdialog.cpp b/plugins/Flanger/FlangerControlsDialog.cpp
similarity index 97%
rename from plugins/flanger/flangercontrolsdialog.cpp
rename to plugins/Flanger/FlangerControlsDialog.cpp
index 8b3c61df4..26b223b29 100644
--- a/plugins/flanger/flangercontrolsdialog.cpp
+++ b/plugins/Flanger/FlangerControlsDialog.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "flangercontrolsdialog.h"
-#include "flangercontrols.h"
+#include "FlangerControlsDialog.h"
+#include "FlangerControls.h"
 #include "embed.h"
 #include "LedCheckbox.h"
 #include "TempoSyncKnob.h"
diff --git a/plugins/flanger/flangercontrolsdialog.h b/plugins/Flanger/FlangerControlsDialog.h
similarity index 100%
rename from plugins/flanger/flangercontrolsdialog.h
rename to plugins/Flanger/FlangerControlsDialog.h
diff --git a/plugins/flanger/flangereffect.cpp b/plugins/Flanger/FlangerEffect.cpp
similarity index 99%
rename from plugins/flanger/flangereffect.cpp
rename to plugins/Flanger/FlangerEffect.cpp
index fcaadfca7..4a029dad8 100644
--- a/plugins/flanger/flangereffect.cpp
+++ b/plugins/Flanger/FlangerEffect.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "flangereffect.h"
+#include "FlangerEffect.h"
 #include "Engine.h"
 #include "embed.cpp"
 
diff --git a/plugins/flanger/flangereffect.h b/plugins/Flanger/FlangerEffect.h
similarity index 93%
rename from plugins/flanger/flangereffect.h
rename to plugins/Flanger/FlangerEffect.h
index 04f308249..ac6125623 100644
--- a/plugins/flanger/flangereffect.h
+++ b/plugins/Flanger/FlangerEffect.h
@@ -27,10 +27,10 @@
 #define FLANGEREFFECT_H
 
 #include "Effect.h"
-#include "flangercontrols.h"
-#include "quadraturelfo.h"
-#include "monodelay.h"
-#include "noise.h"
+#include "FlangerControls.h"
+#include "QuadratureLfo.h"
+#include "MonoDelay.h"
+#include "Noise.h"
 
 
 class FlangerEffect : public Effect
diff --git a/plugins/flanger/monodelay.cpp b/plugins/Flanger/MonoDelay.cpp
similarity index 98%
rename from plugins/flanger/monodelay.cpp
rename to plugins/Flanger/MonoDelay.cpp
index ebb5b322d..9cb473721 100644
--- a/plugins/flanger/monodelay.cpp
+++ b/plugins/Flanger/MonoDelay.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "monodelay.h"
+#include "MonoDelay.h"
 #include "interpolation.h"
 #include "lmms_math.h"
 
diff --git a/plugins/flanger/monodelay.h b/plugins/Flanger/MonoDelay.h
similarity index 100%
rename from plugins/flanger/monodelay.h
rename to plugins/Flanger/MonoDelay.h
diff --git a/plugins/flanger/noise.cpp b/plugins/Flanger/Noise.cpp
similarity index 98%
rename from plugins/flanger/noise.cpp
rename to plugins/Flanger/Noise.cpp
index 2c4606381..4d4c06e0a 100644
--- a/plugins/flanger/noise.cpp
+++ b/plugins/Flanger/Noise.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "noise.h"
+#include "Noise.h"
 #include "lmms_math.h"
 
 Noise::Noise()
diff --git a/plugins/flanger/noise.h b/plugins/Flanger/Noise.h
similarity index 100%
rename from plugins/flanger/noise.h
rename to plugins/Flanger/Noise.h
diff --git a/plugins/flanger/quadraturelfo.cpp b/plugins/Flanger/QuadratureLfo.cpp
similarity index 97%
rename from plugins/flanger/quadraturelfo.cpp
rename to plugins/Flanger/QuadratureLfo.cpp
index 49e8299ad..bc31dc326 100644
--- a/plugins/flanger/quadraturelfo.cpp
+++ b/plugins/Flanger/QuadratureLfo.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "quadraturelfo.h"
+#include "QuadratureLfo.h"
 
 QuadratureLfo::QuadratureLfo( int sampleRate )
 {
diff --git a/plugins/flanger/quadraturelfo.h b/plugins/Flanger/QuadratureLfo.h
similarity index 100%
rename from plugins/flanger/quadraturelfo.h
rename to plugins/Flanger/QuadratureLfo.h
diff --git a/plugins/flanger/artwork.png b/plugins/Flanger/artwork.png
similarity index 100%
rename from plugins/flanger/artwork.png
rename to plugins/Flanger/artwork.png
diff --git a/plugins/flanger/logo.png b/plugins/Flanger/logo.png
similarity index 100%
rename from plugins/flanger/logo.png
rename to plugins/Flanger/logo.png
diff --git a/plugins/flanger/CMakeLists.txt b/plugins/flanger/CMakeLists.txt
deleted file mode 100644
index bb3579e73..000000000
--- a/plugins/flanger/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-INCLUDE(BuildPlugin)
-
-BUILD_PLUGIN(flanger flangereffect.cpp flangercontrols.cpp flangercontrolsdialog.cpp noise.cpp quadraturelfo.cpp monodelay.cpp MOCFILES flangercontrols.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

From dd27dc688a5c4c9b19a924a04b5307cf6358526e Mon Sep 17 00:00:00 2001
From: Dave French <dave.french3@googlemail.com>
Date: Tue, 23 Dec 2014 09:33:13 +0000
Subject: [PATCH 4/4] updated as per 1474

---
 plugins/Flanger/MonoDelay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Flanger/MonoDelay.cpp b/plugins/Flanger/MonoDelay.cpp
index 9cb473721..9afc3ee17 100644
--- a/plugins/Flanger/MonoDelay.cpp
+++ b/plugins/Flanger/MonoDelay.cpp
@@ -55,7 +55,7 @@ MonoDelay::~MonoDelay()
 void MonoDelay::tick( sample_t* sample )
 {
 	m_buffer[m_index] = *sample;
-	int readIndex = m_index - ( int )m_length;
+	int readIndex = m_index - ( int )m_length - 1;
 	if(readIndex < 0)
 	{
 		readIndex += m_maxLength;