Improved Waveshaper / Spline-based graph replacement

plugins/CMakeLists.txt

@@ -79,7 +79,8 @@ IF("${PLUGIN_LIST}" STREQUAL "")
 		vst_base
 		VstEffect
 		watsyn
-		waveshaper
+        waveshaper
+        waveshaper2
 		vibed
 		Xpressive
 		zynaddsubfx

plugins/waveshaper2/CMakeLists.txt

@@ -0,0 +1,3 @@
+INCLUDE(BuildPlugin)
+
+BUILD_PLUGIN(waveshaper2 waveshaper2.cpp waveshaper2_controls.cpp waveshaper2_control_dialog.cpp MOCFILES waveshaper2_controls.h waveshaper2_control_dialog.h EMBEDDED_RESOURCES *.png)

plugins/waveshaper2/waveshaper2.cpp

@@ -0,0 +1,164 @@
+/*
+ * waveshaper.cpp - waveshaper effect-plugin
+ *
+ * Copyright (c) 2018 Joshua Wade (https://github.com/SecondFlight)
+ * Copyright (c) 2014 Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>
+ * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
+ * This file is part of LMMS - https://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 "waveshaper2.h"
+#include "lmms_math.h"
+#include "embed.h"
+#include "interpolation.h"
+
+
+extern "C"
+{
+
+Plugin::Descriptor PLUGIN_EXPORT waveshaper2_plugin_descriptor =
+{
+	STRINGIFY( PLUGIN_NAME ),
+	"Waveshaper 2",
+	QT_TRANSLATE_NOOP( "pluginBrowser",
+				"plugin for waveshaping" ),
+	"Joshua Wade <lastname/firstinitial/at/southern/dot/edu>",
+	0x0100,
+	Plugin::Effect,
+	new PluginPixmapLoader("logo"),
+	NULL,
+	NULL
+} ;
+
+}
+
+
+
+waveShaper2Effect::waveShaper2Effect( Model * _parent,
+			const Descriptor::SubPluginFeatures::Key * _key ) :
+	Effect( &waveshaper2_plugin_descriptor, _parent, _key ),
+	m_wsControls( this )
+{
+}
+
+
+
+
+waveShaper2Effect::~waveShaper2Effect()
+{
+}
+
+
+
+
+bool waveShaper2Effect::processAudioBuffer( sampleFrame * _buf,
+							const fpp_t _frames )
+{
+	if( !isEnabled() || !isRunning () )
+	{
+		return( false );
+	}
+
+// variables for effect
+	int i = 0;
+
+	double out_sum = 0.0;
+	const float d = dryLevel();
+	const float w = wetLevel();
+	float input = m_wsControls.m_inputModel.value();
+	float output = m_wsControls.m_outputModel.value();
+
+	ValueBuffer *inputBuffer = m_wsControls.m_inputModel.valueBuffer();
+	ValueBuffer *outputBufer = m_wsControls.m_outputModel.valueBuffer();
+
+	int inputInc = inputBuffer ? 1 : 0;
+	int outputInc = outputBufer ? 1 : 0;
+
+	const float *inputPtr = inputBuffer ? &( inputBuffer->values()[ 0 ] ) : &input;
+	const float *outputPtr = outputBufer ? &( outputBufer->values()[ 0 ] ) : &output;
+
+	for( fpp_t f = 0; f < _frames; ++f )
+	{
+		float s[2] = { _buf[f][0], _buf[f][1] };
+
+// apply input gain
+		s[0] *= *inputPtr;
+		s[1] *= *inputPtr;
+
+// clip if clip enabled
+		//if( clip )
+		//{
+			s[0] = qBound( -1.0f, s[0], 1.0f );
+			s[1] = qBound( -1.0f, s[1], 1.0f );
+		//}
+
+// start effect
+
+		for( i=0; i <= 1; ++i )
+		{
+			bool invert = false;
+			if (s[i] < 0)
+				invert = true;
+
+			if (invert)
+				s[i] *= -1;
+
+			s[i] = m_wsControls.m_vectorGraphModel.calculateSample(s[i]);
+
+			if (invert)
+				s[i] *= -1;
+		}
+
+// apply output gain
+		s[0] *= *outputPtr;
+		s[1] *= *outputPtr;
+
+		out_sum += _buf[f][0]*_buf[f][0] + _buf[f][1]*_buf[f][1];
+// mix wet/dry signals
+		_buf[f][0] = d * _buf[f][0] + w * s[0];
+		_buf[f][1] = d * _buf[f][1] + w * s[1];
+
+		outputPtr += outputInc;
+		inputPtr += inputInc;
+	}
+
+	checkGate( out_sum / _frames );
+
+	return( isRunning() );
+}
+
+
+
+
+
+extern "C"
+{
+
+// necessary for getting instance out of shared lib
+PLUGIN_EXPORT Plugin * lmms_plugin_main( Model * _parent, void * _data )
+{
+	return( new waveShaper2Effect( _parent,
+		static_cast<const Plugin::Descriptor::SubPluginFeatures::Key *>(
+								_data ) ) );
+}
+
+}
+

plugins/waveshaper2/waveshaper2.h

@@ -0,0 +1,62 @@
+/*
+ * waveshaper.h - waveshaper effect-plugin
+ *
+ * Copyright (c) 2014 Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>
+ * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
+ * This file is part of LMMS - https://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.
+ *
+ */
+
+
+#ifndef _WAVESHAPER_H
+#define _WAVESHAPER_H
+
+#include "Effect.h"
+#include "waveshaper2_controls.h"
+
+
+
+class waveShaper2Effect : public Effect
+{
+public:
+	waveShaper2Effect( Model * _parent,
+			const Descriptor::SubPluginFeatures::Key * _key );
+	virtual ~waveShaper2Effect();
+	virtual bool processAudioBuffer( sampleFrame * _buf,
+							const fpp_t _frames );
+
+	virtual EffectControls * controls()
+	{
+		return( &m_wsControls );
+	}
+
+
+private:
+
+	waveShaper2Controls m_wsControls;
+
+	friend class waveShaper2Controls;
+
+} ;
+
+
+
+
+
+#endif

plugins/waveshaper2/waveshaper2_control_dialog.cpp

@@ -0,0 +1,79 @@
+/*
+ * waveshaper_control_dialog.cpp - control-dialog for waveshaper-effect
+ *
+ * Copyright (c) 2014 Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>
+ * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
+ * This file is part of LMMS - https://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 <QLayout>
+
+#include "waveshaper2_control_dialog.h"
+#include "waveshaper2_controls.h"
+#include "embed.h"
+//#include "Graph.h"
+#include "VectorGraph.h"
+#include "PixmapButton.h"
+#include "ToolTip.h"
+#include "LedCheckbox.h"
+
+
+waveShaper2ControlDialog::waveShaper2ControlDialog(
+					waveShaper2Controls * _controls ) :
+	EffectControlDialog( _controls )
+{
+	setAutoFillBackground( true );
+	QPalette pal;
+	pal.setBrush( backgroundRole(),
+				PLUGIN_NAME::getIconPixmap( "artwork" ) );
+	setPalette( pal );
+	setFixedSize( 224, 274 );
+
+	VectorGraph * graph = new VectorGraph( this, 204, 205 );
+	graph->move( 10, 6 );
+	graph->setMaximumSize( 204, 205 );
+	graph -> setModel( &_controls -> m_vectorGraphModel );
+
+
+
+	Knob * inputKnob = new Knob( knobBright_26, this);
+	inputKnob -> setVolumeKnob( true );
+	inputKnob -> setVolumeRatio( 1.0 );
+	inputKnob -> move( 26, 225 );
+	inputKnob->setModel( &_controls->m_inputModel );
+	inputKnob->setLabel( tr( "INPUT" ) );
+	inputKnob->setHintText( tr( "Input gain:" ) , "" );
+
+	Knob * outputKnob = new Knob( knobBright_26, this );
+	outputKnob -> setVolumeKnob( true );
+	outputKnob -> setVolumeRatio( 1.0 );
+	outputKnob -> move( 76, 225 );
+	outputKnob->setModel( &_controls->m_outputModel );
+	outputKnob->setLabel( tr( "OUTPUT" ) );
+	outputKnob->setHintText( tr( "Output gain:" ), "" );
+
+	LedCheckBox * clipInputToggle = new LedCheckBox( "Clip input", this,
+							tr( "Clip input" ), LedCheckBox::Green );
+	clipInputToggle -> move( 131, 252 );
+	clipInputToggle -> setModel( &_controls -> m_clipModel );
+	ToolTip::add( clipInputToggle, tr( "Clip input signal to 0dB" ) );
+}
+

plugins/waveshaper2/waveshaper2_control_dialog.h

@@ -0,0 +1,49 @@
+/*
+ * waveshaper_control_dialog.h - control-dialog for waveshaper-effect
+ *
+ * * Copyright (c) 2014 Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>
+ * Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
+ * This file is part of LMMS - https://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.
+ *
+ */
+
+#ifndef _WAVESHAPER_CONTROL_DIALOG_H
+#define _WAVESHAPER_CONTROL_DIALOG_H
+
+#include "EffectControlDialog.h"
+#include "VectorGraph.h"
+
+
+class waveShaper2Controls;
+
+
+class waveShaper2ControlDialog : public EffectControlDialog
+{
+	Q_OBJECT
+public:
+	waveShaper2ControlDialog( waveShaper2Controls * _controls );
+	virtual ~waveShaper2ControlDialog()
+	{
+	}
+
+
+private:
+} ;
+
+#endif