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

Fix some data races flagged when running the AudioPlaybackDemo with Xcode's thread sanitiser enabled

Browse source
This commit is contained in:
ed 2019-04-01 15:39:27 +01:00
parent 98244f1ed1
commit fb5cfcd606
5 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/juce_audio_basics/sources/juce_ResamplingAudioSource.cpp
View file

@ -27,11 +27,6 @@ ResamplingAudioSource::ResamplingAudioSource (AudioSource* const inputSource,
const bool deleteInputWhenDeleted,
const int channels)
: input (inputSource, deleteInputWhenDeleted),
ratio (1.0),
lastRatio (1.0),
bufferPos (0),
sampsInBuffer (0),
subSampleOffset (0),
numChannels (channels)
{
jassert (input != nullptr);
@ -67,6 +62,8 @@ void ResamplingAudioSource::prepareToPlay (int samplesPerBlockExpected, double s
void ResamplingAudioSource::flushBuffers()
{
const ScopedLock sl (callbackLock);
buffer.clear();
bufferPos = 0;
sampsInBuffer = 0;
@ -82,10 +79,12 @@ void ResamplingAudioSource::releaseResources()
void ResamplingAudioSource::getNextAudioBlock (const AudioSourceChannelInfo& info)
{
const ScopedLock sl (callbackLock);
double localRatio;
{
const SpinLock::ScopedLockType sl (ratioLock);
const SpinLock::ScopedLockType ratioSl (ratioLock);
localRatio = ratio;
}

7
modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h
View file

@ -76,12 +76,13 @@ public:
private:
//==============================================================================
OptionalScopedPointer<AudioSource> input;
double ratio, lastRatio;
double ratio = 1.0, lastRatio = 1.0;
AudioBuffer<float> buffer;
int bufferPos, sampsInBuffer;
double subSampleOffset;
int bufferPos = 0, sampsInBuffer = 0;
double subSampleOffset = 0.0;
double coefficients[6];
SpinLock ratioLock;
CriticalSection callbackLock;
const int numChannels;
HeapBlock<float*> destBuffers;
HeapBlock<const float*> srcBuffers;

3
modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp
View file

@ -125,10 +125,7 @@ void AudioTransportSource::stop()
{
if (playing)
{
{
const ScopedLock sl (callbackLock);
playing = false;
}
int n = 500;
while (--n >= 0 && ! stopped)

2
modules/juce_audio_devices/sources/juce_AudioTransportSource.h
View file

@ -167,7 +167,7 @@ private:
CriticalSection callbackLock;
float gain = 1.0f, lastGain = 1.0f;
bool playing = false, stopped = true;
std::atomic<bool> playing { false }, stopped { true };
double sampleRate = 44100.0, sourceSampleRate = 0;
int blockSize = 128, readAheadBufferSize = 0;
bool isPrepared = false, inputStreamEOF = false;

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

@ -214,7 +214,7 @@ private:
std::unique_ptr<InputSource> source;
std::unique_ptr<AudioFormatReader> reader;
CriticalSection readerLock;
uint32 lastReaderUseTime = 0;
std::atomic<uint32> lastReaderUseTime { 0 };
void createReader()
{
@ -645,6 +645,7 @@ bool AudioThumbnail::setDataSource (LevelDataSource* newSource)
JUCE_ASSERT_MESSAGE_MANAGER_IS_LOCKED
numSamplesFinished = 0;
auto wasSuccessful = [&] { return sampleRate > 0 && totalSamples > 0; };
if (cache.loadThumb (*this, newSource->hashCode) && isFullyLoaded())
{
@ -654,10 +655,11 @@ bool AudioThumbnail::setDataSource (LevelDataSource* newSource)
source->sampleRate = sampleRate;
source->numChannels = (unsigned int) numChannels;
source->numSamplesFinished = numSamplesFinished;
return wasSuccessful();
}
else
{
source.reset (newSource); // (make sure this isn't done before loadThumb is called)
source.reset (newSource);
const ScopedLock sl (lock);
source->initialise (numSamplesFinished);
@ -667,9 +669,8 @@ bool AudioThumbnail::setDataSource (LevelDataSource* newSource)
numChannels = (int32) source->numChannels;
createChannels (1 + (int) (totalSamples / samplesPerThumbSample));
}
return sampleRate > 0 && totalSamples > 0;
return wasSuccessful();
}
bool AudioThumbnail::setSource (InputSource* const newSource)