diff --git a/plugins/eq/artwork.png b/plugins/eq/artwork.png index 8a4a0418b..73b3473b4 100644 Binary files a/plugins/eq/artwork.png and b/plugins/eq/artwork.png differ diff --git a/plugins/eq/eqcontrolsdialog.cpp b/plugins/eq/eqcontrolsdialog.cpp index f6424788a..0633a8cf5 100644 --- a/plugins/eq/eqcontrolsdialog.cpp +++ b/plugins/eq/eqcontrolsdialog.cpp @@ -51,7 +51,7 @@ EqControlsDialog::EqControlsDialog(EqControls *controls) : m_inSpec = new EqSpectrumView( &controls->m_inFftBands, this); m_inSpec->move( 50, 5 ); - m_inSpec->color = QColor( 255, 0, 255, 80 ); + m_inSpec->color = QColor( 255, 0, 255, 150 ); m_outSpec = new EqSpectrumView( &controls->m_outFftBands, this); m_outSpec->move( 50, 5 ); m_outSpec->color = QColor(00, 255, 255, 80); @@ -92,45 +92,57 @@ EqControlsDialog::EqControlsDialog(EqControls *controls) : for( int i = 0; i < m_parameterWidget->bandCount() ; i++) { m_resKnob = new Knob( knobBright_26, this ); - m_resKnob->move(cw * i + ko , 205 ); + if(i ==0 || i == 7) + { + m_resKnob->move(cw * i + ko , 190 ); + } else + { + m_resKnob->move(cw * i + ko , 205 ); + } m_resKnob->setVolumeKnob(false); m_resKnob->setModel( m_parameterWidget->getBandModels( i )->res ); m_resKnob->setHintText( tr( "Resonance:") , ""); m_freqKnob = new Knob( knobBright_26, this ); - m_freqKnob->move(cw * i + ko, 235 ); + if( i == 0 || i == 7 ) + { + m_freqKnob->move( cw * i + ko, 222 ); + } else + { + m_freqKnob->move(cw * i + ko, 235 ); + } m_freqKnob->setVolumeKnob( false ); m_freqKnob->setModel( m_parameterWidget->getBandModels( i )->freq ); m_freqKnob->setHintText( tr( "Frequency:" ), "Hz" ); - m_activeBox = new LedCheckBox( m_parameterWidget->getBandModels( i )->name , this ); + m_activeBox = new LedCheckBox( m_parameterWidget->getBandModels( i )->name , this , "" , LedCheckBox::Green ); m_activeBox->move( cw * i + fo + 3, 260 ); m_activeBox->setModel( m_parameterWidget->getBandModels( i )->active ); } //hp filter type - m_hp12Box = new LedCheckBox( tr( "12dB" ), this ); - m_hp12Box->move( cw*0 + ko, 175 ); + m_hp12Box = new LedCheckBox( tr( "12dB" ), this , "" , LedCheckBox::Green ); + m_hp12Box->move( cw*0 + ko, 170 ); m_hp12Box->setModel( &controls->m_hp12Model ); - m_hp24Box = new LedCheckBox( tr( "24dB" ), this ); - m_hp24Box->move( cw*0 + ko, 155 ); + m_hp24Box = new LedCheckBox( tr( "24dB" ), this , "" , LedCheckBox::Green ); + m_hp24Box->move( cw*0 + ko, 150 ); m_hp24Box->setModel( &controls->m_hp24Model ); - m_hp48Box = new LedCheckBox( tr( "48dB" ), this ); - m_hp48Box->move( cw*0 + ko, 135 ); + m_hp48Box = new LedCheckBox( tr( "48dB" ), this , "" , LedCheckBox::Green ); + m_hp48Box->move( cw*0 + ko, 130 ); m_hp48Box->setModel( &controls->m_hp48Model ); //LP filter type - m_lp12Box = new LedCheckBox( tr( "12dB"), this ); - m_lp12Box->move( cw*7 + ko -5 , 175 ); + m_lp12Box = new LedCheckBox( tr( "12dB"), this , "" , LedCheckBox::Green ); + m_lp12Box->move( cw*7 + ko -5 , 170 ); m_lp12Box->setModel( &controls->m_lp12Model ); - m_lp24Box = new LedCheckBox( tr( "24dB"), this ); - m_lp24Box->move( cw*7 + ko - 5, 155 ); + m_lp24Box = new LedCheckBox( tr( "24dB"), this , "" , LedCheckBox::Green ); + m_lp24Box->move( cw*7 + ko - 5, 150 ); m_lp24Box->setModel( &controls->m_lp24Model ); - m_lp48Box = new LedCheckBox( tr( "48dB"), this ); - m_lp48Box->move( cw*7 + ko - 5, 135 ); + m_lp48Box = new LedCheckBox( tr( "48dB"), this , "" , LedCheckBox::Green ); + m_lp48Box->move( cw*7 + ko - 5, 130 ); m_lp48Box->setModel( &controls->m_lp48Model ); automatableButtonGroup *lpBtnGrp = new automatableButtonGroup(this,tr ( "lp grp" ) ); @@ -146,8 +158,8 @@ EqControlsDialog::EqControlsDialog(EqControls *controls) : hpBtnGrp->setModel( &m_controls->m_hpTypeModel,false); //Analize Box - m_analyzeBox = new LedCheckBox( tr( "Analyze" ), this ); - m_analyzeBox->move( cw*1 + ko + 5, 10 ); + m_analyzeBox = new LedCheckBox( tr( "Analyze" ), this , "" , LedCheckBox::Green ); + m_analyzeBox->move( cw*1 + ko + 5, 15 ); m_analyzeBox->setModel( &controls->m_analyzeModel ); } diff --git a/plugins/eq/eqeffect.cpp b/plugins/eq/eqeffect.cpp index 9c52d688b..992aab69b 100644 --- a/plugins/eq/eqeffect.cpp +++ b/plugins/eq/eqeffect.cpp @@ -59,11 +59,11 @@ EqEffect::EqEffect(Model *parent, const Plugin::Descriptor::SubPluginFeatures::K Effect( &eq_plugin_descriptor, parent, key ), m_eqControls( this ) { - m_dFilterCount = 20; + m_dFilterCount = 6; m_downsampleFilters = new EqLinkwitzRiley[m_dFilterCount]; for( int i = 0; i < m_dFilterCount; i++) { - m_downsampleFilters[i].setFrequency(21500); + m_downsampleFilters[i].setFrequency(20000); m_downsampleFilters[i].setSR(Engine::mixer()->processingSampleRate() * 2 ); } m_upBuf = 0; diff --git a/plugins/eq/eqparameterwidget.cpp b/plugins/eq/eqparameterwidget.cpp index 059555108..6a3ae7aa1 100644 --- a/plugins/eq/eqparameterwidget.cpp +++ b/plugins/eq/eqparameterwidget.cpp @@ -40,7 +40,7 @@ EqParameterWidget::EqParameterWidget( QWidget *parent ) : // connect( Engine::mainWindow(), SIGNAL( periodicUpdate() ), this, SLOT( update() ) ); QTimer *timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(update())); - timer->start(200); + timer->start(100); float totalLength = log10( 21000 ); m_pixelsPerUnitWidth = width( ) / totalLength ; float totalHeight = 80;