Merge pull request #1487 from curlymorphic/flanger

Flanger correct calculation,

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)

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")

plugins/Flanger/FlangerControls.cpp

@@ -0,0 +1,83 @@
+/*
+ * flangercontrols.cpp - defination of FlangerControls class.
+ *
+ * Copyright (c) 2014 David French <dave/dot/french3/at/googlemail/dot/com>
+ *
+ * This file is part of LMMS - http://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <QtXml/QDomElement>
+
+#include "FlangerControls.h"
+#include "FlangerEffect.h"
+#include "Engine.h"
+#include "Song.h"
+
+
+
+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" ) )
+
+{
+	connect( Engine::mixer(), SIGNAL( sampleRateChanged() ), this, SLOT( changedSampleRate() ) );
+}
+
+
+
+
+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" );
+
+}
+
+
+
+
+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" );
+}
+
+
+
+
+void FlangerControls::changedSampleRate()
+{
+	m_effect->changeSampleRate();
+}
+
+

plugins/flanger/flangercontrols.h → plugins/Flanger/FlangerControls.h

@@ -27,48 +27,48 @@
 
 #include "EffectControls.h"
 #include "Knob.h"
-#include "flangercontrolsdialog.h"
+#include "FlangerControlsDialog.h"
 
 
 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;
 
 };
 

plugins/flanger/flangercontrolsdialog.cpp → 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"

plugins/flanger/flangercontrolsdialog.h → 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

plugins/Flanger/FlangerEffect.cpp

@@ -0,0 +1,151 @@
+/*
+ * flangereffect.cpp - defination of FlangerEffect class.
+ *
+ * Copyright (c) 2014 David French <dave/dot/french3/at/googlemail/dot/com>
+ *
+ * This file is part of LMMS - http://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include "FlangerEffect.h"
+#include "Engine.h"
+#include "embed.cpp"
+
+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
+} ;
+
+
+
+
+FlangerEffect::FlangerEffect( Model *parent, const Plugin::Descriptor::SubPluginFeatures::Key *key ) :
+	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;
+}
+
+
+
+
+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;
+	}
+}
+
+
+
+
+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] );
+		}
+
+		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();
+}
+
+
+
+
+void FlangerEffect::changeSampleRate()
+{
+	m_lfo->setSampleRate( Engine::mixer()->processingSampleRate() );
+	m_lDelay->setSampleRate( Engine::mixer()->processingSampleRate() );
+	m_rDelay->setSampleRate( Engine::mixer()->processingSampleRate() );
+}
+
+
+
+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 ) );
+}
+
+}}