Added a XY pad to the Delay Pluging. also added a volume control, and smothed the delay time input changes, to improve audio.

plugins/Delay/DelayControlsDialog.cpp

@@ -26,6 +26,9 @@
 #include "DelayControls.h"
 #include "embed.h"
 #include "TempoSyncKnob.h"
+#include "../Eq/EqFader.h"
+#include <QMouseEvent>
+#include <QPainter>
 
 
 
@@ -37,37 +40,112 @@ DelayControlsDialog::DelayControlsDialog( DelayControls *controls ) :
 	QPalette pal;
 	pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "artwork" ) );
 	setPalette( pal );
-	setFixedSize( 200, 75 );
+	setFixedSize( 300, 200 );
 
 	TempoSyncKnob* sampleDelayKnob = new TempoSyncKnob( knobBright_26, this );
-	sampleDelayKnob->move( 20,10 );
+	sampleDelayKnob->move( 13,10 );
 	sampleDelayKnob->setVolumeKnob( false );
 	sampleDelayKnob->setModel( &controls->m_delayTimeModel );
 	sampleDelayKnob->setLabel( tr( "Delay" ) );
 	sampleDelayKnob->setHintText( tr( "Delay Time" ) + " ", " s" );
 
 	Knob * feedbackKnob = new Knob( knobBright_26, this );
-	feedbackKnob->move( 63,10 );
+	feedbackKnob->move( 13, 55 );
 	feedbackKnob->setVolumeKnob( true) ;
 	feedbackKnob->setModel( &controls->m_feedbackModel);
 	feedbackKnob->setLabel( tr( "Regen" ) );
 	feedbackKnob->setHintText( tr ( "Feedback Amount" ) + " " , "" );
 
 	TempoSyncKnob * lfoFreqKnob = new TempoSyncKnob( knobBright_26, this );
-	lfoFreqKnob->move( 106,10 );
+	lfoFreqKnob->move( 13, 100 );
 	lfoFreqKnob->setVolumeKnob( false );
 	lfoFreqKnob->setModel( &controls->m_lfoTimeModel );
 	lfoFreqKnob->setLabel( tr( "Rate" ) );
 	lfoFreqKnob->setHintText( tr ( "Lfo") + " ", " s" );
 
 	TempoSyncKnob * lfoAmtKnob = new TempoSyncKnob( knobBright_26, this );
-	lfoAmtKnob->move( 150,10 );
+	lfoAmtKnob->move( 13, 145 );
 	lfoAmtKnob->setVolumeKnob( false );
 	lfoAmtKnob->setModel( &controls->m_lfoAmountModel );
 	lfoAmtKnob->setLabel( tr( "Lfo" ) );
 	lfoAmtKnob->setHintText( tr ( "Lfo Amt" ) + " " , " s" );
 
+	EqFader * outFader = new EqFader( &controls->m_outGainModel,tr( "Out Gain" ),
+									  this, &controls->m_outPeakL, &controls->m_outPeakR );
+	outFader->setMaximumHeight( 196 );
+	outFader->move( 263, 42 );
+	outFader->setDisplayConversion( false );
+	outFader->setHintText( tr( "Gain" ), "dBv" );
 
+	XyPad * pad = new XyPad( this, &controls->m_feedbackModel, &controls->m_delayTimeModel );
+	pad->resize( 196, 196 );
+	pad->move( 50, 2 );
 }
 
 
+
+
+XyPad::XyPad(QWidget *parent, FloatModel *xModel, FloatModel *yModel) :
+	QWidget( parent ),
+	m_xModel( xModel ),
+	m_yModel( yModel ),
+	m_acceptInput( false )
+{
+	connect( m_xModel, SIGNAL( dataChanged() ) , this, SLOT( update() ) );
+	connect( m_yModel, SIGNAL( dataChanged() ) , this, SLOT( update() ) );
+}
+
+
+
+
+void XyPad::paintEvent(QPaintEvent *event)
+{
+	QPainter painter( this );
+		//Draw Frequecy maker lines
+		painter.setPen( QPen( QColor( 200, 200, 200, 200 ), 8, Qt::SolidLine, Qt::RoundCap, Qt::BevelJoin ) );
+		float xRange = m_xModel->maxValue() - m_xModel->minValue();
+		float xInc = xRange / width();
+		int xPos = ( m_xModel->value() - m_xModel->minValue() ) / xInc;
+
+		float yRange = m_yModel->maxValue() - m_yModel->minValue();
+		float yInc = yRange / height();
+		int yPos = ( m_yModel->value() - m_yModel->minValue() ) / yInc;
+
+		painter.drawPoint( xPos, yPos );
+}
+
+
+
+
+void XyPad::mousePressEvent(QMouseEvent *event)
+{
+	m_acceptInput = true;
+}
+
+
+
+
+void XyPad::mouseReleaseEvent(QMouseEvent *event)
+{
+	m_acceptInput = false;
+}
+
+
+
+
+void XyPad::mouseMoveEvent(QMouseEvent *event)
+{
+	if( m_acceptInput && (event->x() >= 0) && ( event->x() < width() )
+			&& ( event->y() >= 0) && ( event->y() < height() ) )
+	{
+		//set xmodel
+		float xRange = m_xModel->maxValue() - m_xModel->minValue();
+		float xInc = xRange / width();
+		m_xModel->setValue( m_xModel->minValue() + ( event->x() * xInc ) );
+
+		//set ymodel
+		float yRange = m_yModel->maxValue() - m_yModel->minValue();
+		float yInc = yRange / height();
+		m_yModel->setValue( m_yModel->minValue() + ( event->y() * yInc ) );
+	}
+}