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

EQ: Don't Load XML data any more 

Also abolished use of nPoints, making parameters easier to set up.
This also fixes an issue where more points than are there could be read, if cfg file bad.
This commit is contained in:
James Crook 2019-08-23 11:54:14 +01:00
parent 889bf7c191
commit bbc202807f
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/effects/Equalization.cpp
View File

@ -337,7 +337,6 @@ bool EffectEqualization::DefineParams( ShuttleParams & S ){
if( dynamic_cast<ShuttleGetAutomation*>(&S)) if( dynamic_cast<ShuttleGetAutomation*>(&S))
{ {
int numPoints = mCurves[ 0 ].points.size(); int numPoints = mCurves[ 0 ].points.size();
S.Define( numPoints, wxString("nPoints"), 0, 0,200,1);
int point; int point;
for( point = 0; point < numPoints; point++ ) for( point = 0; point < numPoints; point++ )
{ {
@ -350,17 +349,18 @@ bool EffectEqualization::DefineParams( ShuttleParams & S ){
} }
else else
{ {
int numPoints=0;// = mLogEnvelope->GetNumberOfPoints();
S.Define( numPoints, wxString("nPoints"), 0, 0,200,1);
mCurves[0].points.clear(); mCurves[0].points.clear();
for (int i = 0; i < numPoints; i++) for (int i = 0; i < 200; i++)
{ {
const wxString nameFreq = wxString::Format("f%i",i); const wxString nameFreq = wxString::Format("f%i",i);
const wxString nameVal = wxString::Format("v%i",i); const wxString nameVal = wxString::Format("v%i",i);
double f,d; double f = -1000.0;
double d = 0.0;
S.Define( f, nameFreq, 0.0, -10000.0, 10000.0, 0.0 ); S.Define( f, nameFreq, 0.0, -10000.0, 10000.0, 0.0 );
S.Define( d, nameVal, 0.0, -10000.0, 10000.0, 0.0 ); S.Define( d, nameVal, 0.0, -10000.0, 10000.0, 0.0 );
if( f <= 0.0 )
break;
mCurves[0].points.push_back( EQPoint( f,d )); mCurves[0].points.push_back( EQPoint( f,d ));
} }
setCurve( 0 ); setCurve( 0 );
@ -1439,6 +1439,14 @@ void EffectEqualization::Filter(size_t len, float *buffer)
// //
void EffectEqualization::LoadCurves(const wxString &fileName, bool append) void EffectEqualization::LoadCurves(const wxString &fileName, bool append)
{ {
// We've disabled the XML management of curves.
// Just going via .cfg files now.
#if 1
(void)fileName;
(void)append;
mCurves.clear();
mCurves.push_back( _("unnamed") ); // we still need a default curve to use
#else
// Construct normal curve filename // Construct normal curve filename
// //
// LLL: Wouldn't you know that as of WX 2.6.2, there is a conflict // LLL: Wouldn't you know that as of WX 2.6.2, there is a conflict
@ -1518,7 +1526,7 @@ void EffectEqualization::LoadCurves(const wxString &fileName, bool append)
{ {
mCurves.back().points = tempCustom.points; mCurves.back().points = tempCustom.points;
} }
#endif
return; return;
} }