Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-25 16:48:44 +02:00
Code Issues Releases Wiki Activity

Propagate progress bar cancellation correctly in Normalize

Browse Source
This commit is contained in:
Paul Licameli 2017-01-07 14:39:50 -05:00
parent 97fd8f5689
commit 7dbb946d29
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/effects/Normalize.cpp
View File

@ -194,7 +194,9 @@ bool EffectNormalize::Process()
else else
msg = topMsg + _("Analyzing first track of stereo pair: ") + trackName; msg = topMsg + _("Analyzing first track of stereo pair: ") + trackName;
float offset, min, max; float offset, min, max;
AnalyseTrack(track, msg, curTrackNum, offset, min, max); if (! ( bGoodResult =
AnalyseTrack(track, msg, curTrackNum, offset, min, max) ) )
break;
if(!track->GetLinked() || mStereoInd) { if(!track->GetLinked() || mStereoInd) {
// mono or 'stereo tracks independently' // mono or 'stereo tracks independently'
float extent = wxMax(fabs(max), fabs(min)); float extent = wxMax(fabs(max), fabs(min));
@ -220,7 +222,9 @@ bool EffectNormalize::Process()
track = (WaveTrack *) iter.Next(); // get the next one track = (WaveTrack *) iter.Next(); // get the next one
msg = topMsg + _("Analyzing second track of stereo pair: ") + trackName; msg = topMsg + _("Analyzing second track of stereo pair: ") + trackName;
float offset2, min2, max2; float offset2, min2, max2;
AnalyseTrack(track, msg, curTrackNum + 1, offset2, min2, max2); if ( ! ( bGoodResult =
AnalyseTrack(track, msg, curTrackNum + 1, offset2, min2, max2) ) )
break;
float extent = wxMax(fabs(min), fabs(max)); float extent = wxMax(fabs(min), fabs(max));
extent = wxMax(extent, fabs(min2)); extent = wxMax(extent, fabs(min2));
extent = wxMax(extent, fabs(max2)); extent = wxMax(extent, fabs(max2));
@ -325,7 +329,7 @@ bool EffectNormalize::TransferDataFromWindow()
// EffectNormalize implementation // EffectNormalize implementation
void EffectNormalize::AnalyseTrack(const WaveTrack * track, const wxString &msg, bool EffectNormalize::AnalyseTrack(const WaveTrack * track, const wxString &msg,
int curTrackNum, int curTrackNum,
float &offset, float &min, float &max) float &offset, float &min, float &max)
{ {
@ -334,7 +338,9 @@ void EffectNormalize::AnalyseTrack(const WaveTrack * track, const wxString &msg,
// TODO: should we restrict the flags to just the relevant block files (for selections) // TODO: should we restrict the flags to just the relevant block files (for selections)
while (track->GetODFlags()) { while (track->GetODFlags()) {
// update the gui // update the gui
mProgress->Update(0, wxT("Waiting for waveform to finish computing...")); if (ProgressResult::Cancelled == mProgress->Update(
0, wxT("Waiting for waveform to finish computing...")) )
return false;
wxMilliSleep(100); wxMilliSleep(100);
} }
@ -344,11 +350,13 @@ void EffectNormalize::AnalyseTrack(const WaveTrack * track, const wxString &msg,
} }
if(mDC) { if(mDC) {
AnalyseDC(track, msg, curTrackNum, offset); auto rc = AnalyseDC(track, msg, curTrackNum, offset);
min += offset; min += offset;
max += offset; max += offset;
return rc;
} else { } else {
offset = 0.0; offset = 0.0;
return true;
} }
} }

2
src/effects/Normalize.h
View File

@ -58,7 +58,7 @@ private:
bool ProcessOne( bool ProcessOne(
WaveTrack * t, const wxString &msg, int curTrackNum, float offset); WaveTrack * t, const wxString &msg, int curTrackNum, float offset);
void AnalyseTrack(const WaveTrack * track, const wxString &msg, bool AnalyseTrack(const WaveTrack * track, const wxString &msg,
int curTrackNum, int curTrackNum,
float &offset, float &min, float &max); float &offset, float &min, float &max);
void AnalyzeData(float *buffer, size_t len); void AnalyzeData(float *buffer, size_t len);