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

more simplification of arguments

Browse Source
This commit is contained in:
Paul Licameli 2015-08-16 21:14:41 -04:00
parent a6172d932b
commit e4fe449021
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/WaveClip.cpp
View File

@ -789,11 +789,13 @@ void SpecCache::CalculateOneSpectrum
WaveTrackCache &waveTrackCache, WaveTrackCache &waveTrackCache,
int xx, sampleCount numSamples, int xx, sampleCount numSamples,
double offset, double rate, double offset, double rate,
bool autocorrelation, const std::vector<float> &gainFactors, const std::vector<float> &gainFactors,
float *scratch) float *scratch)
{ {
const int windowSize = settings.windowSize; const int windowSize = settings.windowSize;
sampleCount start = where[xx]; sampleCount start = where[xx];
const bool autocorrelation =
settings.algorithm == SpectrogramSettings::algPitchEAC;
const int zeroPaddingFactor = (autocorrelation ? 1 : settings.zeroPaddingFactor); const int zeroPaddingFactor = (autocorrelation ? 1 : settings.zeroPaddingFactor);
const int padding = (windowSize * (zeroPaddingFactor - 1)) / 2; const int padding = (windowSize * (zeroPaddingFactor - 1)) / 2;
const int fftLen = windowSize * zeroPaddingFactor; const int fftLen = windowSize * zeroPaddingFactor;
@ -906,7 +908,7 @@ void SpecCache::Populate
for (sampleCount xx = lowerBoundX; xx < upperBoundX; ++xx) for (sampleCount xx = lowerBoundX; xx < upperBoundX; ++xx)
CalculateOneSpectrum( CalculateOneSpectrum(
settings, waveTrackCache, xx, numSamples, settings, waveTrackCache, xx, numSamples,
offset, rate, autocorrelation, gainFactors, &buffer[0]); offset, rate, gainFactors, &buffer[0]);
} }
} }

2
src/WaveClip.h
View File

@ -97,7 +97,7 @@ public:
WaveTrackCache &waveTrackCache, WaveTrackCache &waveTrackCache,
int xx, sampleCount numSamples, int xx, sampleCount numSamples,
double offset, double rate, double offset, double rate,
bool autocorrelation, const std::vector<float> &gainFactors, const std::vector<float> &gainFactors,
float *scratch); float *scratch);
void Populate void Populate