audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix EQ effect based on Peter's feedback

This commit is contained in:
Leland Lucius 2015-04-22 13:02:55 -05:00
parent 61b9888eaf
commit 76864cb2d3
2 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/effects/Equalization.cpp
View File

@ -222,13 +222,14 @@ EffectEqualization::EffectEqualization()
mM = DEF_FilterLength;
mLin = DEF_InterpLin;
mDrawMode = DEF_DrawMode;
mDrawGrid = DEF_DrawGrid;
mInterp = DEF_InterpMeth;
mdBMin = DEF_dBMin;
mdBMax = DEF_dBMax;
mCurveName = DEF_CurveName;
GetPrivateConfig(GetCurrentSettingsGroup(), wxT("dBMin"), mdBMin, DEF_dBMin);
GetPrivateConfig(GetCurrentSettingsGroup(), wxT("dBMax"), mdBMax, DEF_dBMax);
GetPrivateConfig(GetCurrentSettingsGroup(), wxT("DrawMode"), mDrawMode, DEF_DrawMode);
GetPrivateConfig(GetCurrentSettingsGroup(), wxT("DrawGrid"), mDrawGrid, DEF_DrawGrid);
for (int i = 0; i < kNumInterpolations; i++)
{
mInterpolations.Add(wxGetTranslation(kInterpStrings[i]));
@ -853,10 +854,9 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
//
bool EffectEqualization::TransferDataToWindow()
{
GetPrivateConfig(GetCurrentSettingsGroup(), wxT("dBMin"), mdBMin, DEF_dBMin);
GetPrivateConfig(GetCurrentSettingsGroup(), wxT("dBMax"), mdBMax, DEF_dBMax);
GetPrivateConfig(GetCurrentSettingsGroup(), wxT("DrawMode"), mDrawMode, DEF_DrawMode);
GetPrivateConfig(GetCurrentSettingsGroup(), wxT("DrawGrid"), mDrawGrid, DEF_DrawGrid);
// Start with a clean slate
Flatten();
mDirty = false;
// Set log or lin freq scale (affects interpolation as well)
mLinFreq->SetValue( mLin );
@ -891,7 +891,6 @@ bool EffectEqualization::TransferDataToWindow()
// Set graphic interpolation mode
mInterpChoice->SetSelection(mInterp);
// Set Graphic (Fader) or Draw mode
// Set Graphic (Fader) or Draw mode
if (mDrawMode)
{
@ -1607,6 +1606,35 @@ void EffectEqualization::EnvelopeUpdated(Envelope *env, bool lin)
delete [] value;
}
//
// Flatten the curve
//
void EffectEqualization::Flatten()
{
mLogEnvelope->Flatten(0.);
mLogEnvelope->SetTrackLen(1.0);
mLinEnvelope->Flatten(0.);
mLinEnvelope->SetTrackLen(1.0);
mPanel->ForceRecalc();
if( !mDrawMode )
{
for( int i=0; i< mBandsInUse; i++)
{
mSliders[i]->SetValue(0);
mSlidersOld[i] = 0;
mEQVals[i] = 0.;
wxString tip;
if( kThirdOct[i] < 1000.)
tip.Printf( wxT("%dHz\n%.1fdB"), (int)kThirdOct[i], 0. );
else
tip.Printf( wxT("%gkHz\n%.1fdB"), kThirdOct[i]/1000., 0. );
mSliders[i]->SetToolTip(tip);
}
}
EnvelopeUpdated();
}
//
// Process XML tags and handle the ones we recognize
//
@ -2394,28 +2422,7 @@ void EffectEqualization::OnManage(wxCommandEvent & WXUNUSED(event))
void EffectEqualization::OnClear(wxCommandEvent & WXUNUSED(event))
{
mLogEnvelope->Flatten(0.);
mLogEnvelope->SetTrackLen(1.0);
mLinEnvelope->Flatten(0.);
mLinEnvelope->SetTrackLen(1.0);
mPanel->ForceRecalc();
if( !mDrawMode )
{
for( int i=0; i< mBandsInUse; i++)
{
mSliders[i]->SetValue(0);
mSlidersOld[i] = 0;
mEQVals[i] = 0.;
wxString tip;
if( kThirdOct[i] < 1000.)
tip.Printf( wxT("%dHz\n%.1fdB"), (int)kThirdOct[i], 0. );
else
tip.Printf( wxT("%gkHz\n%.1fdB"), kThirdOct[i]/1000., 0. );
mSliders[i]->SetToolTip(tip);
}
}
EnvelopeUpdated();
Flatten();
}
void EffectEqualization::OnInvert(wxCommandEvent & WXUNUSED(event)) // Inverts any curve
@ -2795,6 +2802,11 @@ void EqualizationPanel::OnPaint(wxPaintEvent & WXUNUSED(event))
void EqualizationPanel::OnMouseEvent(wxMouseEvent & event)
{
if (!mEffect->mDrawMode)
{
return;
}
if (event.ButtonDown() && !HasCapture())
{
CaptureMouse();

1
src/effects/Equalization.h
View File

@ -133,6 +133,7 @@ private:
virtual bool CalcFilter();
void Filter(sampleCount len, float *buffer);
void Flatten();
void EnvelopeUpdated();
void EnvelopeUpdated(Envelope *env, bool lin);