diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2020-10-08 01:05:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 01:05:30 +0200 |
| commit | bee15eeed753e63810cf8497e9631cce2d7e3416 (patch) | |
| tree | 1eda2927725ed7245891f5c05f3ed0ef6342992c /src | |
| parent | a050e64ad417f2909443f314accaa2a94d89ec0c (diff) | |
| parent | 559bfc70a580e405449e12ffa458f966d2b62a0c (diff) | |
Merge pull request #3157 from uklotzde/analyzerthread
AnalyzerThread: Fix debug assertion
Diffstat (limited to 'src')
| -rw-r--r-- | src/analyzer/analyzerthread.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/analyzer/analyzerthread.cpp b/src/analyzer/analyzerthread.cpp index d4b905fff1..91d47436b5 100644 --- a/src/analyzer/analyzerthread.cpp +++ b/src/analyzer/analyzerthread.cpp @@ -311,11 +311,12 @@ AnalyzerThread::AnalysisResult AnalyzerThread::analyzeAudioSource( const double frameProgress = double(audioSource->frameLength() - remainingFrameRange.length()) / double(audioSource->frameLength()); + // math_min is required to compensate rounding errors const AnalyzerProgress progress = - frameProgress * - (kAnalyzerProgressFinalizing - kAnalyzerProgressNone); + math_min(kAnalyzerProgressFinalizing, + frameProgress * + (kAnalyzerProgressFinalizing - kAnalyzerProgressNone)); DEBUG_ASSERT(progress > kAnalyzerProgressNone); - DEBUG_ASSERT(progress <= kAnalyzerProgressFinalizing); emitBusyProgress(progress); } else { // Unreadable audio source |