hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Remove unnecessary includes from Eq plugin

Browse Source
This commit is contained in:
Lukas W
2017-03-25 18:42:03 +01:00
parent 0d77cefc13
commit 84d662409c
5 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/Eq/EqControls.cpp
View File

@@ -26,11 +26,11 @@
#include <QtXml/QDomElement>
#include "EqControlsDialog.h"
#include "EqEffect.h"
EqControls::EqControls( EqEffect *effect ) :
EffectControls( effect ),
m_effect( effect ),
@@ -149,6 +149,11 @@ void EqControls::loadSettings( const QDomElement &_this )
m_analyseOutModel.loadSettings( _this, "AnalyseOut" );
}
EffectControlDialog*EqControls::createView()
{
return new EqControlsDialog( this );
}

7
plugins/Eq/EqControls.h
View File

@@ -26,7 +26,7 @@
#define EQCONTROLS_H
#include "EffectControls.h"
#include "EqControlsDialog.h"
#include "EqSpectrumView.h"
class EqEffect;
@@ -54,10 +54,7 @@ public:
return 42;
}
virtual EffectControlDialog* createView()
{
return new EqControlsDialog( this );
}
virtual EffectControlDialog* createView();
float m_inPeakL;
float m_inPeakR;

28
plugins/Eq/EqControlsDialog.cpp
View File

@@ -32,10 +32,15 @@
#include "AutomatableButton.h"
#include "embed.h"
#include "Engine.h"
#include "EqControls.h"
#include "EqFader.h"
#include "Knob.h"
#include "Fader.h"
#include "LedCheckbox.h"
#include "PixmapButton.h"
#include "EqControls.h"
#include "EqFader.h"
#include "EqParameterWidget.h"
#include "EqSpectrumView.h"
EqControlsDialog::EqControlsDialog( EqControls *controls ) :
@@ -214,3 +219,22 @@ void EqControlsDialog::mouseDoubleClickEvent(QMouseEvent *event)
parentWidget()->setFixedHeight( parentWidget()->height() == m_originalHeight ? 283 : m_originalHeight );
update();
}
EqBand* EqControlsDialog::setBand(int index, BoolModel* active, FloatModel* freq, FloatModel* res, FloatModel* gain, QColor color, QString name, float* peakL, float* peakR, BoolModel* hp12, BoolModel* hp24, BoolModel* hp48, BoolModel* lp12, BoolModel* lp24, BoolModel* lp48)
{
EqBand *filterModels = m_parameterWidget->getBandModels( index );
filterModels->active = active;
filterModels->freq = freq;
filterModels->res = res;
filterModels->color = color;
filterModels->gain = gain;
filterModels->peakL = peakL;
filterModels->peakR = peakR;
filterModels->hp12 = hp12;
filterModels->hp24 = hp24;
filterModels->hp48 = hp48;
filterModels->lp12 = lp12;
filterModels->lp24 = lp24;
filterModels->lp48 = lp48;
return filterModels;
}

31
plugins/Eq/EqControlsDialog.h
View File

@@ -29,17 +29,13 @@
#include <QPushButton>
#include "EffectControlDialog.h"
#include "EqParameterWidget.h"
#include "EqSpectrumView.h"
#include "Fader.h"
#include "Knob.h"
#include "LedCheckbox.h"
#include "MainWindow.h"
#include "PixmapButton.h"
class BoolModel;
class FloatModel;
class EqControls;
class EqBand;
class EqParameterWidget;
class EqControlsDialog : public EffectControlDialog
{
@@ -58,24 +54,7 @@ private:
virtual void mouseDoubleClickEvent(QMouseEvent *event);
EqBand *setBand( int index, BoolModel *active, FloatModel *freq, FloatModel *res, FloatModel *gain, QColor color, QString name, float *peakL, float *peakR, BoolModel *hp12, BoolModel *hp24, BoolModel *hp48, BoolModel *lp12, BoolModel *lp24, BoolModel *lp48 )
{
EqBand *filterModels = m_parameterWidget->getBandModels( index );
filterModels->active = active;
filterModels->freq = freq;
filterModels->res = res;
filterModels->color = color;
filterModels->gain = gain;
filterModels->peakL = peakL;
filterModels->peakR = peakR;
filterModels->hp12 = hp12;
filterModels->hp24 = hp24;
filterModels->hp48 = hp48;
filterModels->lp12 = lp12;
filterModels->lp24 = lp24;
filterModels->lp48 = lp48;
return filterModels;
}
EqBand *setBand( int index, BoolModel *active, FloatModel *freq, FloatModel *res, FloatModel *gain, QColor color, QString name, float *peakL, float *peakR, BoolModel *hp12, BoolModel *hp24, BoolModel *hp48, BoolModel *lp12, BoolModel *lp24, BoolModel *lp48 );
int m_originalHeight;
};

1
plugins/Eq/EqEffect.cpp
View File

@@ -29,7 +29,6 @@
#include "EqFader.h"
#include "interpolation.h"
#include "lmms_math.h"
#include "MainWindow.h"
extern "C"