Update of /cvsroot/audacity/audacity-src/src/effects
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25605/src/effects
Modified Files:
Equalization.cpp Equalization.h
Log Message:
'Release' didn't work properly on VS8, it does now. I still don't understand
this.
And I removed an unused array.
Index: Equalization.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Equalization.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- Equalization.cpp 11 Feb 2007 22:09:23 -0000 1.53
+++ Equalization.cpp 14 Feb 2007 01:10:54 -0000 1.54
@@ -73,7 +73,6 @@
#include "../Theme.h"
#include "../AllThemeResources.h"
-
#include <wx/bitmap.h>
#include <wx/button.h>
#include <wx/msgdlg.h>
@@ -827,10 +826,7 @@
double loLog = log10(mLoFreq);
double stepLog = (log10(mHiFreq) - loLog)/((double)NUM_PTS-1.);
for(int i=0; i<NUM_PTS-1; i++)
- {
whens[i] = (double)i/(NUM_PTS-1.);
- whensFreq[i] = pow(10., loLog + i*stepLog); //actual freq for this
position
- }
whens[NUM_PTS-1] = 1.;
whenSliders[NUMBER_OF_BANDS] = 1.;
m_EQVals[NUMBER_OF_BANDS] = 0.;
@@ -1785,7 +1781,7 @@
int minF = 0;
for(int i=0; i<NUM_PTS; i++)
{
- while( (whenSliders[minF] < whens[i]) & (minF < bandsInUse) )
+ while( (whenSliders[minF] <= whens[i]) & (minF < bandsInUse) )
minF++;
minF--;
if( minF < 0 ) //before first slider
@@ -1840,7 +1836,7 @@
}
}
}
- if(whens[i]==0.)
+ if(whens[i]<=0.)
env->Move( 0., value );
env->Insert( whens[i], value );
}
@@ -1853,7 +1849,7 @@
int minF = 0;
for(int i=0; i<NUM_PTS; i++)
{
- while( (whenSliders[minF] < whens[i]) & (minF < bandsInUse) )
+ while( (whenSliders[minF] <= whens[i]) & (minF < bandsInUse) )
minF++;
minF--;
if( minF < 0 ) //before first slider
@@ -1881,10 +1877,10 @@
span = whenSliders[minF+1] - whenSliders[minF];
dist = whenSliders[minF+1] - whens[i];
value = m_EQVals[minF]*(1. + cos(M_PI*(span-dist)/span))/2. +
- m_EQVals[minF+1]*(1. + cos(M_PI*dist/span))/2.;
+ m_EQVals[minF+1]*(1. + cos(M_PI*dist/span))/2.;
}
}
- if(whens[i]==0.)
+ if(whens[i]<=0.)
env->Move( 0., value );
env->Insert( whens[i], value );
}
Index: Equalization.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Equalization.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Equalization.h 11 Feb 2007 22:09:23 -0000 1.23
+++ Equalization.h 14 Feb 2007 01:10:54 -0000 1.24
@@ -216,7 +216,6 @@
float dBMin;
float dBMax;
double whens[NUM_PTS];
- double whensFreq[NUM_PTS];
double whenSliders[NUMBER_OF_BANDS+1];
int bandsInUse;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
