Merge branch 'stable-1.2'

# Conflicts:
#	include/MixerWorkerThread.h
#	src/core/MixerWorkerThread.cpp

plugins/Flanger/FlangerControls.cpp

@@ -43,6 +43,7 @@ FlangerControls::FlangerControls( FlangerEffect *effect ) :
 
 {
 	connect( Engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( changedSampleRate() ) );
+	connect( Engine::getSong(), SIGNAL( playbackStateChanged() ), this, SLOT( changedPlaybackState() ) );
 }
 
 
@@ -81,3 +82,9 @@ void FlangerControls::changedSampleRate()
 }
 
 
+
+
+void FlangerControls::changedPlaybackState()
+{
+	m_effect->restartLFO();
+}

plugins/Flanger/FlangerControls.h

@@ -57,6 +57,7 @@ public:
 
 private slots:
 	void changedSampleRate();
+	void changedPlaybackState();
 
 private:
 	FlangerEffect* m_effect;

plugins/Flanger/FlangerEffect.cpp

@@ -68,7 +68,7 @@ FlangerEffect::~FlangerEffect()
 	{
 		delete m_rDelay;
 	}
-	if(m_lfo )
+	if( m_lfo )
 	{
 		delete m_lfo;
 	}
@@ -139,6 +139,15 @@ void FlangerEffect::changeSampleRate()
 
 
 
+
+void FlangerEffect::restartLFO()
+{
+	m_lfo->restart();
+}
+
+
+
+
 extern "C"
 {
 

plugins/Flanger/FlangerEffect.h

@@ -44,6 +44,7 @@ public:
 		return &m_flangerControls;
 	}
 	void changeSampleRate();
+	void restartLFO();
 
 private:
 	FlangerControls m_flangerControls;

plugins/Flanger/QuadratureLfo.h

@@ -53,6 +53,14 @@ public:
 
 
 
+	inline void restart()
+	{
+		m_phase = 0;
+	}
+
+
+
+
 	inline void setSampleRate ( int samplerate )
 	{
 		m_samplerate = samplerate;