Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 16:10:06 +02:00
Code Issues Releases Wiki Activity

Hopefully this'll fix the assertions

Browse Source
This commit is contained in:
Leland Lucius 2015-08-16 15:04:24 -05:00
parent a36e51b4c2
commit 5a9025b558
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/effects/Equalization.cpp
View File

@ -248,7 +248,7 @@ EffectEqualization::EffectEqualization()
mLinEnvelope->Mirror(false); mLinEnvelope->Mirror(false);
mLinEnvelope->SetRange(MIN_dBMin, MAX_dBMax); // MB: this is the highest possible range mLinEnvelope->SetRange(MIN_dBMin, MAX_dBMax); // MB: this is the highest possible range
mEnvelope = (IsLinear() ? mLinEnvelope : mLogEnvelope); mEnvelope = (mLin ? mLinEnvelope : mLogEnvelope);
mWindowSize = windowSize; mWindowSize = windowSize;
@ -336,7 +336,7 @@ bool EffectEqualization::GetAutomationParameters(EffectAutomationParameters & pa
{ {
parms.Write(KEY_FilterLength, mM); parms.Write(KEY_FilterLength, mM);
parms.Write(KEY_CurveName, mCurveName); parms.Write(KEY_CurveName, mCurveName);
parms.Write(KEY_InterpLin, IsLinear()); parms.Write(KEY_InterpLin, mLin);
parms.WriteEnum(KEY_InterpMeth, mInterp, wxArrayString(kNumInterpolations, kInterpStrings)); parms.WriteEnum(KEY_InterpMeth, mInterp, wxArrayString(kNumInterpolations, kInterpStrings));
return true; return true;
@ -367,7 +367,7 @@ bool EffectEqualization::SetAutomationParameters(EffectAutomationParameters & pa
InterpMeth -= kNumInterpolations; InterpMeth -= kNumInterpolations;
} }
mEnvelope = (IsLinear() ? mLinEnvelope : mLogEnvelope); mEnvelope = (mLin ? mLinEnvelope : mLogEnvelope);
return true; return true;
} }
@ -521,7 +521,7 @@ bool EffectEqualization::Init()
break; break;
} }
mEnvelope = (IsLinear() ? mLinEnvelope : mLogEnvelope); mEnvelope = (mLin ? mLinEnvelope : mLogEnvelope);
setCurve(mCurveName); setCurve(mCurveName);
@ -962,7 +962,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
bool EffectEqualization::TransferDataToWindow() bool EffectEqualization::TransferDataToWindow()
{ {
// Set log or lin freq scale (affects interpolation as well) // Set log or lin freq scale (affects interpolation as well)
mLinFreq->SetValue( IsLinear() ); mLinFreq->SetValue( mLin );
wxCommandEvent dummyEvent; wxCommandEvent dummyEvent;
OnLinFreq(dummyEvent); // causes a CalcFilter OnLinFreq(dummyEvent); // causes a CalcFilter
@ -1521,7 +1521,7 @@ void EffectEqualization::setCurve(int currentCurve)
wxASSERT( currentCurve < (int) mCurves.GetCount() ); wxASSERT( currentCurve < (int) mCurves.GetCount() );
bool changed = false; bool changed = false;
if( IsLinear() ) // linear freq mode? if( mLin ) // linear freq mode?
{ {
Envelope *env = mLinEnvelope; Envelope *env = mLinEnvelope;
env->Flatten(0.); env->Flatten(0.);
@ -1567,7 +1567,6 @@ void EffectEqualization::setCurve(int currentCurve)
for(i=0;i<nCurvePoints;i++) for(i=0;i<nCurvePoints;i++)
{ {
float f = mCurves[currentCurve].points[i].Freq;
if( mCurves[currentCurve].points[i].Freq >= 20) if( mCurves[currentCurve].points[i].Freq >= 20)
{ {
when = (log10(mCurves[currentCurve].points[i].Freq) - loLog)/denom; when = (log10(mCurves[currentCurve].points[i].Freq) - loLog)/denom;