From eb3c3ed27ceea789a6de29eee15713d67fc8977e Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Mon, 4 Oct 2021 13:28:46 +0100
Subject: [PATCH] AudioTransportSource:  Fix thread sanitizer warnings

The AudioPlaybackDemo was previously triggering thread sanitizer
warnings when starting playback.
---
 .../sources/juce_AudioTransportSource.cpp     | 26 +++++++++----------
 .../sources/juce_AudioTransportSource.h       |  4 +--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp b/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp
index 9320c5cbdd..64fa144759 100644
--- a/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp
+++ b/modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp
@@ -45,9 +45,6 @@ void AudioTransportSource::setSource (PositionableAudioSource* const newSource,
         setSource (nullptr, 0, nullptr); // deselect and reselect to avoid releasing resources wrongly
     }
 
-    readAheadBufferSize = readAheadSize;
-    sourceSampleRate = sourceSampleRateToCorrectFor;
-
     ResamplingAudioSource* newResamplerSource = nullptr;
     BufferingAudioSource* newBufferingSource = nullptr;
     PositionableAudioSource* newPositionableSource = nullptr;
@@ -82,8 +79,8 @@ void AudioTransportSource::setSource (PositionableAudioSource* const newSource,
 
         if (isPrepared)
         {
-            if (newResamplerSource != nullptr && sourceSampleRate > 0 && sampleRate > 0)
-                newResamplerSource->setResamplingRatio (sourceSampleRate / sampleRate);
+            if (newResamplerSource != nullptr && sourceSampleRateToCorrectFor > 0 && sampleRate > 0)
+                newResamplerSource->setResamplingRatio (sourceSampleRateToCorrectFor / sampleRate);
 
             newMasterSource->prepareToPlay (blockSize, sampleRate);
         }
@@ -97,8 +94,9 @@ void AudioTransportSource::setSource (PositionableAudioSource* const newSource,
         bufferingSource = newBufferingSource;
         masterSource = newMasterSource;
         positionableSource = newPositionableSource;
+        readAheadBufferSize = readAheadSize;
+        sourceSampleRate = sourceSampleRateToCorrectFor;
 
-        inputStreamEOF = false;
         playing = false;
     }
 
@@ -114,7 +112,6 @@ void AudioTransportSource::start()
             const ScopedLock sl (callbackLock);
             playing = true;
             stopped = false;
-            inputStreamEOF = false;
         }
 
         sendChangeMessage();
@@ -157,6 +154,12 @@ double AudioTransportSource::getLengthInSeconds() const
     return 0.0;
 }
 
+bool AudioTransportSource::hasStreamFinished() const noexcept
+{
+    return positionableSource->getNextReadPosition() > positionableSource->getTotalLength() + 1
+              && ! positionableSource->isLooping();
+}
+
 void AudioTransportSource::setNextReadPosition (int64 newPosition)
 {
     if (positionableSource != nullptr)
@@ -168,13 +171,13 @@ void AudioTransportSource::setNextReadPosition (int64 newPosition)
 
         if (resamplerSource != nullptr)
             resamplerSource->flushBuffers();
-
-        inputStreamEOF = false;
     }
 }
 
 int64 AudioTransportSource::getNextReadPosition() const
 {
+    const ScopedLock sl (callbackLock);
+
     if (positionableSource != nullptr)
     {
         const double ratio = (sampleRate > 0 && sourceSampleRate > 0) ? sampleRate / sourceSampleRate : 1.0;
@@ -221,7 +224,6 @@ void AudioTransportSource::prepareToPlay (int samplesPerBlockExpected, double ne
     if (resamplerSource != nullptr && sourceSampleRate > 0)
         resamplerSource->setResamplingRatio (sourceSampleRate / sampleRate);
 
-    inputStreamEOF = false;
     isPrepared = true;
 }
 
@@ -258,11 +260,9 @@ void AudioTransportSource::getNextAudioBlock (const AudioSourceChannelInfo& info
                 info.buffer->clear (info.startSample + 256, info.numSamples - 256);
         }
 
-        if (positionableSource->getNextReadPosition() > positionableSource->getTotalLength() + 1
-              && ! positionableSource->isLooping())
+        if (hasStreamFinished())
         {
             playing = false;
-            inputStreamEOF = true;
             sendChangeMessage();
         }
 
diff --git a/modules/juce_audio_devices/sources/juce_AudioTransportSource.h b/modules/juce_audio_devices/sources/juce_AudioTransportSource.h
index c7341fe240..7e35946c8c 100644
--- a/modules/juce_audio_devices/sources/juce_AudioTransportSource.h
+++ b/modules/juce_audio_devices/sources/juce_AudioTransportSource.h
@@ -102,7 +102,7 @@ public:
     double getLengthInSeconds() const;
 
     /** Returns true if the player has stopped because its input stream ran out of data. */
-    bool hasStreamFinished() const noexcept             { return inputStreamEOF; }
+    bool hasStreamFinished() const noexcept;
 
     //==============================================================================
     /** Starts playing (if a source has been selected).
@@ -170,7 +170,7 @@ private:
     std::atomic<bool> playing { false }, stopped { true };
     double sampleRate = 44100.0, sourceSampleRate = 0;
     int blockSize = 128, readAheadBufferSize = 0;
-    bool isPrepared = false, inputStreamEOF = false;
+    bool isPrepared = false;
 
     void releaseMasterResources();