mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

AudioThumbnail: Fix thread sanitizer warnings

Browse source
This commit is contained in:
reuk 2021-11-03 17:51:36 +00:00
parent f1b6bbc921
commit 6bf969dab9
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp
View file

@ -732,7 +732,7 @@ void AudioThumbnail::setLevels (const MinMaxValue* const* values, int thumbIndex
const ScopedLock sl (lock);
for (int i = jmin (numChans, channels.size()); --i >= 0;)
channels.getUnchecked(i)->write (values[i], thumbIndex, numValues);
channels.getUnchecked (i)->write (values[i], thumbIndex, numValues);
auto start = thumbIndex * (int64) samplesPerThumbSample;
auto end = (thumbIndex + numValues) * (int64) samplesPerThumbSample;
@ -740,7 +740,7 @@ void AudioThumbnail::setLevels (const MinMaxValue* const* values, int thumbIndex
if (numSamplesFinished >= start && end > numSamplesFinished)
numSamplesFinished = end;
totalSamples = jmax (numSamplesFinished, totalSamples.load());
totalSamples = jmax (numSamplesFinished, totalSamples);
window->invalidate();
sendChangeMessage();
}
@ -748,26 +748,31 @@ void AudioThumbnail::setLevels (const MinMaxValue* const* values, int thumbIndex
//==============================================================================
int AudioThumbnail::getNumChannels() const noexcept
{
const ScopedLock sl (lock);
return numChannels;
}
double AudioThumbnail::getTotalLength() const noexcept
{
const ScopedLock sl (lock);
return sampleRate > 0 ? ((double) totalSamples / sampleRate) : 0.0;
}
bool AudioThumbnail::isFullyLoaded() const noexcept
{
const ScopedLock sl (lock);
return numSamplesFinished >= totalSamples - samplesPerThumbSample;
}
double AudioThumbnail::getProportionComplete() const noexcept
{
return jlimit (0.0, 1.0, (double) numSamplesFinished / (double) jmax ((int64) 1, totalSamples.load()));
const ScopedLock sl (lock);
return jlimit (0.0, 1.0, (double) numSamplesFinished / (double) jmax ((int64) 1, totalSamples));
}
int64 AudioThumbnail::getNumSamplesFinished() const noexcept
{
const ScopedLock sl (lock);
return numSamplesFinished;
}

2
modules/juce_audio_utils/gui/juce_AudioThumbnail.h
View file

@ -205,7 +205,7 @@ private:
OwnedArray<ThumbData> channels;
int32 samplesPerThumbSample = 0;
std::atomic<int64> totalSamples { 0 };
int64 totalSamples { 0 };
int64 numSamplesFinished = 0;
int32 numChannels = 0;
double sampleRate = 0;