2 files changed, 16 insertions, 12 deletions
diff --git a/src/audio/backend/miniaudio_backend.cc b/src/audio/backend/miniaudio_backend.cc
index 312d36e..8871d10 100644
--- a/src/audio/backend/miniaudio_backend.cc
+++ b/src/audio/backend/miniaudio_backend.cc
@@ -12,11 +12,11 @@
 
 // Real-time peak measured at actual playback time
 // Updated in audio_callback when samples are read from ring buffer
-volatile float MiniaudioBackend::realtime_peak_ = 0.0f;
+std::atomic<float> MiniaudioBackend::realtime_peak_{0.0f};
 
 // Smooth playback time interpolation
-volatile double MiniaudioBackend::last_callback_time_ = 0.0;
-volatile int64_t MiniaudioBackend::last_callback_samples_ = 0;
+std::atomic<double> MiniaudioBackend::last_callback_time_{0.0};
+std::atomic<int64_t> MiniaudioBackend::last_callback_samples_{0};
 
 // Static callback for miniaudio (C API requirement)
 void MiniaudioBackend::audio_callback(ma_device* pDevice, void* pOutput,
@@ -148,8 +148,10 @@ void MiniaudioBackend::audio_callback(ma_device* pDevice, void* pOutput,
     // Update smooth playback time tracking (absolute time, no epoch needed)
     struct timespec ts;
     clock_gettime(CLOCK_MONOTONIC, &ts);
-    last_callback_time_ = ts.tv_sec + ts.tv_nsec / 1e9;
-    last_callback_samples_ = ring_buffer->get_total_read();
+    last_callback_time_.store(ts.tv_sec + ts.tv_nsec / 1e9,
+                              std::memory_order_release);
+    last_callback_samples_.store(ring_buffer->get_total_read(),
+                                 std::memory_order_release);
 
 #if defined(DEBUG_LOG_RING_BUFFER)
     if (actually_read < samples_to_read) {
@@ -280,11 +282,11 @@ void MiniaudioBackend::shutdown() {
 }
 
 float MiniaudioBackend::get_realtime_peak() {
-  return realtime_peak_;
+  return realtime_peak_.load(std::memory_order_acquire);
 }
 
 void MiniaudioBackend::get_callback_state(double* out_time,
-                                          int64_t* out_samples) {
-  *out_time = last_callback_time_;
-  *out_samples = last_callback_samples_;
+                                           int64_t* out_samples) {
+  *out_time = last_callback_time_.load(std::memory_order_acquire);
+  *out_samples = last_callback_samples_.load(std::memory_order_acquire);
 }
diff --git a/src/audio/backend/miniaudio_backend.h b/src/audio/backend/miniaudio_backend.h
index 953a0c0..01fa790 100644
--- a/src/audio/backend/miniaudio_backend.h
+++ b/src/audio/backend/miniaudio_backend.h
@@ -6,6 +6,8 @@
 
 #include "../audio_backend.h"
 #include "miniaudio.h"
+#include <atomic>
+#include <cstdint>
 
 // Production audio backend using miniaudio library
 // Manages real hardware audio device and playback
@@ -31,11 +33,11 @@ class MiniaudioBackend : public AudioBackend {
 
   // Real-time peak measured at actual playback time (not pre-buffer)
   // Updated in audio_callback when samples are read from ring buffer
-  static volatile float realtime_peak_;
+  static std::atomic<float> realtime_peak_;
 
   // Smooth playback time interpolation (updated in callback)
-  static volatile double last_callback_time_; // Absolute CLOCK_MONOTONIC time
-  static volatile int64_t last_callback_samples_;
+  static std::atomic<double> last_callback_time_; // Absolute CLOCK_MONOTONIC time
+  static std::atomic<int64_t> last_callback_samples_;
 
   // Static callback required by miniaudio C API
   static void audio_callback(ma_device* pDevice, void* pOutput,