Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-26 16:03:53 +02:00
Code Issues Releases Wiki Activity

remove local variables which are not used in this function, and other commented out copy-and-paste code, from the CalibrateNoise() method. Based on patch by Campbell Barton

Browse Source
This commit is contained in:
RichardAsh1981@gmail.com
2013-09-25 19:10:10 +00:00
parent 98b071be7b
commit 550de66cbd
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/VoiceKey.cpp
View File

@@ -747,13 +747,6 @@ void VoiceKey::CalibrateNoise(WaveTrack & t, sampleCount start, sampleCount len)
double sumsc, sumsc2; double sumsc, sumsc2;
double sumdc, sumdc2; double sumdc, sumdc2;
double erg, sc, dc; double erg, sc, dc;
// sampleFormat a1=0;
// sampleFormat a2=0;
// sampleFormat z1=0;
// sampleFormat z2=0; // keeps track of initial and final samples of window to enable updating formulae
int atrend=0; // equals sgn(a2-a1); Keeps track of trend at start of window
int ztrend=0; // equals sgn(z2-z1); Keeps track of trend at end of window
//Now, change the millisecond-based parameters into sample-based parameters //Now, change the millisecond-based parameters into sample-based parameters
//(This depends on WaveTrack t) //(This depends on WaveTrack t)
double rate = t.GetRate(); double rate = t.GetRate();
@@ -775,16 +768,6 @@ void VoiceKey::CalibrateNoise(WaveTrack & t, sampleCount start, sampleCount len)
// if(mUseDirectionChanges) // if(mUseDirectionChanges)
dc = TestDirectionChanges(t,start,WindowSizeInt); dc = TestDirectionChanges(t,start,WindowSizeInt);
//Calculate initial values for the trend trackers--------------------//
//Get((samplePtr)a1, floatSample, start, 1);
// t.Get((samplePtr)a2, floatSample, start+1, 1);
// t.Get((samplePtr)z1, floatSample, start+WindowSizeInt-1, 1);
// t.Get((samplePtr)z2, floatSample, start+WindowSizeInt, 1);
atrend = -1;//sgn(a2-a1);
ztrend = -1;// sgn(z2-z1);
//-------------------------------------------------------------------//
sumerg =0.0; sumerg =0.0;
sumerg2 = 0.0; sumerg2 = 0.0;
sumsc =0.0; sumsc =0.0;
@@ -827,9 +810,6 @@ void VoiceKey::CalibrateNoise(WaveTrack & t, sampleCount start, sampleCount len)
dc = TestDirectionChanges(t,i,blocksize); dc = TestDirectionChanges(t,i,blocksize);
sumdc += (double)dc; sumdc += (double)dc;
sumdc2 += pow((double)dc,2); sumdc2 += pow((double)dc,2);
} }
mEnergyMean = sumerg / samples; mEnergyMean = sumerg / samples;
@@ -841,10 +821,6 @@ void VoiceKey::CalibrateNoise(WaveTrack & t, sampleCount start, sampleCount len)
mDirectionChangesMean = sumdc / samples; mDirectionChangesMean = sumdc / samples;
mDirectionChangesSD =sqrt(sumdc2 / samples - mDirectionChangesMean * mDirectionChangesMean) ; mDirectionChangesSD =sqrt(sumdc2 / samples - mDirectionChangesMean * mDirectionChangesMean) ;
wxString text = wxString::Format(_("Calibration Results\n")); wxString text = wxString::Format(_("Calibration Results\n"));
/* i18n-hint: %1.4f is replaced by a number. sd stands for 'Standard Deviations'*/ /* i18n-hint: %1.4f is replaced by a number. sd stands for 'Standard Deviations'*/
text += wxString::Format(_("Energy -- mean: %1.4f sd: (%1.4f)\n"),mEnergyMean,mEnergySD); text += wxString::Format(_("Energy -- mean: %1.4f sd: (%1.4f)\n"),mEnergyMean,mEnergySD);