Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-28 14:18:41 +02:00
Code Issues Releases Wiki Activity

Remove vestiges of unification of Normalize with Loudness

Browse Source
This commit is contained in:
Paul Licameli 2020-03-21 11:14:13 -04:00
parent c690e03471
commit b683ed8c07
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/effects/Normalize.cpp
View File

@ -388,7 +388,7 @@ bool EffectNormalize::AnalyseTrack(const WaveTrack * track, const TranslatableSt
if(mDC) if(mDC)
{ {
result = AnalyseTrackData(track, msg, progress, ANALYSE_DC, offset); result = AnalyseTrackData(track, msg, progress, offset);
min += offset; min += offset;
max += offset; max += offset;
} }
@ -396,7 +396,7 @@ bool EffectNormalize::AnalyseTrack(const WaveTrack * track, const TranslatableSt
else if(mDC) else if(mDC)
{ {
min = -1.0, max = 1.0; // sensible defaults? min = -1.0, max = 1.0; // sensible defaults?
result = AnalyseTrackData(track, msg, progress, ANALYSE_DC, offset); result = AnalyseTrackData(track, msg, progress, offset);
min += offset; min += offset;
max += offset; max += offset;
} }
@ -414,7 +414,7 @@ bool EffectNormalize::AnalyseTrack(const WaveTrack * track, const TranslatableSt
//AnalyseTrackData() takes a track, transforms it to bunch of buffer-blocks, //AnalyseTrackData() takes a track, transforms it to bunch of buffer-blocks,
//and executes selected AnalyseOperation on it... //and executes selected AnalyseOperation on it...
bool EffectNormalize::AnalyseTrackData(const WaveTrack * track, const TranslatableString &msg, bool EffectNormalize::AnalyseTrackData(const WaveTrack * track, const TranslatableString &msg,
double &progress, AnalyseOperation op, float &offset) double &progress, float &offset)
{ {
bool rc = true; bool rc = true;
@ -453,8 +453,7 @@ bool EffectNormalize::AnalyseTrackData(const WaveTrack * track, const Translatab
totalSamples += blockSamples; totalSamples += blockSamples;
//Process the buffer. //Process the buffer.
if(op == ANALYSE_DC) AnalyseDataDC(buffer.get(), block);
AnalyseDataDC(buffer.get(), block);
//Increment s one blockfull of samples //Increment s one blockfull of samples
s += block; s += block;

7
src/effects/Normalize.h
View File

@ -58,17 +58,12 @@ public:
private: private:
// EffectNormalize implementation // EffectNormalize implementation
enum AnalyseOperation
{
ANALYSE_DC, ANALYSE_LOUDNESS, ANALYSE_LOUDNESS_DC
};
bool ProcessOne( bool ProcessOne(
WaveTrack * t, const TranslatableString &msg, double& progress, float offset); WaveTrack * t, const TranslatableString &msg, double& progress, float offset);
bool AnalyseTrack(const WaveTrack * track, const TranslatableString &msg, bool AnalyseTrack(const WaveTrack * track, const TranslatableString &msg,
double &progress, float &offset, float &extent); double &progress, float &offset, float &extent);
bool AnalyseTrackData(const WaveTrack * track, const TranslatableString &msg, double &progress, bool AnalyseTrackData(const WaveTrack * track, const TranslatableString &msg, double &progress,
AnalyseOperation op, float &offset); float &offset);
void AnalyseDataDC(float *buffer, size_t len); void AnalyseDataDC(float *buffer, size_t len);
void ProcessData(float *buffer, size_t len, float offset); void ProcessData(float *buffer, size_t len, float offset);