From 6cd2ed022dbafa87ceea5387dde3fb1e4e0544f2 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Wed, 14 Dec 2022 13:17:57 +0000
Subject: [PATCH] CoreAudio:  Avoid race on currentSampleRate data member of
 AudioIODeviceCombiner

---
 modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
index 370874d377..aeedc0d23f 100644
--- a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
+++ b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
@@ -1605,8 +1605,7 @@ public:
             }
         }
 
-        open (inputChannelsRequested, outputChannelsRequested,
-              newSampleRate, newBufferSize);
+        open (inputChannelsRequested, outputChannelsRequested, newSampleRate, newBufferSize);
 
         start (cb);
     }
@@ -1914,7 +1913,8 @@ private:
     struct DeviceWrapper  : public AudioIODeviceCallback
     {
         DeviceWrapper (AudioIODeviceCombiner& cd, std::unique_ptr<CoreAudioIODevice> d, bool shouldBeInput)
-            : owner (cd), device (std::move (d)),
+            : owner (cd),
+              device (std::move (d)),
               input (shouldBeInput)
         {
             device->setAsyncRestarter (&owner);
@@ -1974,7 +1974,7 @@ private:
 
         std::uint64_t nsToSampleTime (std::uint64_t ns) const noexcept
         {
-            return static_cast<std::uint64_t> (std::round (static_cast<double> (ns) * owner.currentSampleRate * 1e-9));
+            return static_cast<std::uint64_t> (std::round (static_cast<double> (ns) * device->getCurrentSampleRate() * 1e-9));
         }
 
         void updateSampleTimeFromContext (const AudioIODeviceCallbackContext& context) noexcept