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

Bug 1750 - Equalization: EQ control points can disappear if the points are at the same frequency

Browse Source
This commit is contained in:
James Crook 2019-08-23 19:28:35 +01:00
parent a1f0a70ddd
commit 83ddabc895
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Envelope.cpp
View File

@ -366,6 +366,11 @@ void Envelope::Insert(int point, const EnvPoint &p)
mEnv.insert(mEnv.begin() + point, p); mEnv.insert(mEnv.begin() + point, p);
} }
void Envelope::Insert(double when, double value)
{
mEnv.push_back( EnvPoint{ when, value });
}
void Envelope::CollapseRegion( double t0, double t1, double sampleDur ) void Envelope::CollapseRegion( double t0, double t1, double sampleDur )
// NOFAIL-GUARANTEE // NOFAIL-GUARANTEE
{ {

4
src/Envelope.h
View File

@ -199,6 +199,10 @@ public:
/** \brief insert a point */ /** \brief insert a point */
void Insert(int point, const EnvPoint &p); void Insert(int point, const EnvPoint &p);
// Insert a point (without replacement)
// for now assumed sequential.
void Insert(double when, double value);
/** \brief Return number of points */ /** \brief Return number of points */
size_t GetNumberOfPoints() const; size_t GetNumberOfPoints() const;

28
src/effects/Equalization.cpp
View File

@ -1768,7 +1768,7 @@ void EffectEqualization::setCurve(int currentCurve)
when = (log10(std::max((double) loFreqI, when)) - loLog)/denom; when = (log10(std::max((double) loFreqI, when)) - loLog)/denom;
} }
value = mCurves[currentCurve].points[0].dB; value = mCurves[currentCurve].points[0].dB;
env->InsertOrReplace(std::min(1.0, std::max(0.0, when)), value); env->Insert(std::min(1.0, std::max(0.0, when)), value);
ForceRecalc(); ForceRecalc();
return; return;
} }
@ -1788,7 +1788,7 @@ void EffectEqualization::setCurve(int currentCurve)
when = mCurves[currentCurve].points[pointCount].Freq / mHiFreq; when = mCurves[currentCurve].points[pointCount].Freq / mHiFreq;
value = mCurves[currentCurve].points[pointCount].dB; value = mCurves[currentCurve].points[pointCount].dB;
if(when <= 1) { if(when <= 1) {
env->InsertOrReplace(when, value); env->Insert(when, value);
if (when == 1) if (when == 1)
break; break;
} }
@ -1807,7 +1807,7 @@ void EffectEqualization::setCurve(int currentCurve)
} }
else else
value = nextDB; value = nextDB;
env->InsertOrReplace(when, value); env->Insert(when, value);
break; break;
} }
} }
@ -1829,7 +1829,7 @@ void EffectEqualization::setCurve(int currentCurve)
// All points below 20 Hz, so just use final point. // All points below 20 Hz, so just use final point.
when = 0.0; when = 0.0;
value = mCurves[currentCurve].points[numPoints-1].dB; value = mCurves[currentCurve].points[numPoints-1].dB;
env->InsertOrReplace(when, value); env->Insert(when, value);
ForceRecalc(); ForceRecalc();
return; return;
} }
@ -1844,7 +1844,7 @@ void EffectEqualization::setCurve(int currentCurve)
double nextDB = mCurves[currentCurve].points[firstAbove20Hz].dB; double nextDB = mCurves[currentCurve].points[firstAbove20Hz].dB;
when = 0.0; when = 0.0;
value = nextDB - ((nextDB - prevDB) * ((nextF - loLog) / (nextF - prevF))); value = nextDB - ((nextDB - prevDB) * ((nextF - loLog) / (nextF - prevF)));
env->InsertOrReplace(when, value); env->Insert(when, value);
} }
// Now get the rest. // Now get the rest.
@ -1856,7 +1856,7 @@ void EffectEqualization::setCurve(int currentCurve)
when = (flog - loLog)/denom; when = (flog - loLog)/denom;
value = mCurves[currentCurve].points[pointCount].dB; value = mCurves[currentCurve].points[pointCount].dB;
if(when <= 1.0) { if(when <= 1.0) {
env->InsertOrReplace(when, value); env->Insert(when, value);
} }
else { else {
// This looks weird when adjusting curve in Draw mode if // This looks weird when adjusting curve in Draw mode if
@ -1880,7 +1880,7 @@ void EffectEqualization::setCurve(int currentCurve)
((value - lastDB) * ((value - lastDB) *
((log10(mHiFreq) - logLastF) / (flog - logLastF))); ((log10(mHiFreq) - logLastF) / (flog - logLastF)));
} }
env->InsertOrReplace(when, value); env->Insert(when, value);
break; break;
} }
} }
@ -2297,7 +2297,7 @@ void EffectEqualization::UpdateGraphic()
{ {
when = freq/mHiFreq; when = freq/mHiFreq;
value = mLinEnvelope->GetValue(when); value = mLinEnvelope->GetValue(when);
mLinEnvelope->InsertOrReplace(when, value); mLinEnvelope->Insert(when, value);
} }
EnvLinToLog(); EnvLinToLog();
@ -2364,7 +2364,7 @@ void EffectEqualization::EnvLogToLin(void)
double denom = hiLog - loLog; double denom = hiLog - loLog;
for (size_t i = 0; i < numPoints; i++) for (size_t i = 0; i < numPoints; i++)
mLinEnvelope->InsertOrReplace(pow( 10., ((when[i] * denom) + loLog))/mHiFreq , value[i]); mLinEnvelope->Insert(pow( 10., ((when[i] * denom) + loLog))/mHiFreq , value[i]);
mLinEnvelope->Reassign(1., value[numPoints-1]); mLinEnvelope->Reassign(1., value[numPoints-1]);
} }
@ -2395,13 +2395,13 @@ void EffectEqualization::EnvLinToLog(void)
// Caution: on Linux, when when == 20, the log calulation rounds // Caution: on Linux, when when == 20, the log calulation rounds
// to just under zero, which causes an assert error. // to just under zero, which causes an assert error.
double flog = (log10(when[i]*mHiFreq)-loLog)/denom; double flog = (log10(when[i]*mHiFreq)-loLog)/denom;
mLogEnvelope->InsertOrReplace(std::max(0.0, flog) , value[i]); mLogEnvelope->Insert(std::max(0.0, flog) , value[i]);
} }
else else
{ //get the first point as close as we can to the last point requested { //get the first point as close as we can to the last point requested
changed = true; changed = true;
double v = value[i]; double v = value[i];
mLogEnvelope->InsertOrReplace(0., v); mLogEnvelope->Insert(0., v);
} }
} }
mLogEnvelope->Reassign(1., value[numPoints - 1]); mLogEnvelope->Reassign(1., value[numPoints - 1]);
@ -2558,7 +2558,7 @@ void EffectEqualization::GraphicEQ(Envelope *env)
} }
if(mWhens[i]<=0.) if(mWhens[i]<=0.)
env->Reassign(0., value); env->Reassign(0., value);
env->InsertOrReplace( mWhens[i], value ); env->Insert( mWhens[i], value );
} }
env->Reassign( 1., value ); env->Reassign( 1., value );
break; break;
@ -2602,7 +2602,7 @@ void EffectEqualization::GraphicEQ(Envelope *env)
} }
if(mWhens[i]<=0.) if(mWhens[i]<=0.)
env->Reassign(0., value); env->Reassign(0., value);
env->InsertOrReplace( mWhens[i], value ); env->Insert( mWhens[i], value );
} }
env->Reassign( 1., value ); env->Reassign( 1., value );
break; break;
@ -2615,7 +2615,7 @@ void EffectEqualization::GraphicEQ(Envelope *env)
spline(mWhenSliders, mEQVals, mBandsInUse+1, y2); spline(mWhenSliders, mEQVals, mBandsInUse+1, y2);
for(double xf=0; xf<1.; xf+=1./NUM_PTS) for(double xf=0; xf<1.; xf+=1./NUM_PTS)
{ {
env->InsertOrReplace(xf, splint(mWhenSliders, mEQVals, mBandsInUse+1, y2, xf)); env->Insert(xf, splint(mWhenSliders, mEQVals, mBandsInUse+1, y2, xf));
} }
break; break;
} }