1 files changed, 27 insertions, 50 deletions

diff --git a/src/audio/ring_buffer.cc b/src/audio/ring_buffer.cc
index b30ebbb..a7e5d9e 100644
--- a/src/audio/ring_buffer.cc
+++ b/src/audio/ring_buffer.cc
@@ -3,9 +3,8 @@
 
 #include "ring_buffer.h"
 #include "util/debug.h"
+#include "util/fatal_error.h"
 #include <algorithm>
-#include <cstdio>  // for fprintf()
-#include <cstdlib> // for abort()
 #include <cstring>
 
 AudioRingBuffer::AudioRingBuffer()
@@ -51,44 +50,33 @@ int AudioRingBuffer::write(const float* samples, int count) {
   const int write = write_pos_.load(std::memory_order_acquire);
 
   // BOUNDS CHECK: Validate write position
-  if (write < 0 || write >= capacity_) {
-    fprintf(stderr, "FATAL: write_pos out of bounds! write=%d, capacity=%d\n",
-            write, capacity_);
-    abort();
-  }
+  FATAL_CHECK(write < 0 || write >= capacity_,
+              "write_pos out of bounds! write=%d, capacity=%d\n", write,
+              capacity_);
 
   const int space_to_end = capacity_ - write;
 
   if (to_write <= space_to_end) {
     // Write in one chunk
     // BOUNDS CHECK
-    if (write < 0 || write + to_write > capacity_) {
-      fprintf(stderr,
-              "BOUNDS ERROR in write(): write=%d, to_write=%d, capacity=%d\n",
-              write, to_write, capacity_);
-      abort();
-    }
+    FATAL_CHECK(write < 0 || write + to_write > capacity_,
+                "BOUNDS ERROR in write(): write=%d, to_write=%d, capacity=%d\n",
+                write, to_write, capacity_);
     memcpy(&buffer_[write], samples, to_write * sizeof(float));
     write_pos_.store((write + to_write) % capacity_, std::memory_order_release);
   } else {
     // Write in two chunks (wrap around)
     // BOUNDS CHECK - first chunk
-    if (write < 0 || write + space_to_end > capacity_) {
-      fprintf(stderr,
-              "BOUNDS ERROR in write() chunk1: write=%d, space_to_end=%d, "
-              "capacity=%d\n",
-              write, space_to_end, capacity_);
-      abort();
-    }
+    FATAL_CHECK(write < 0 || write + space_to_end > capacity_,
+                "BOUNDS ERROR in write() chunk1: write=%d, space_to_end=%d, "
+                "capacity=%d\n",
+                write, space_to_end, capacity_);
     memcpy(&buffer_[write], samples, space_to_end * sizeof(float));
     const int remainder = to_write - space_to_end;
     // BOUNDS CHECK - second chunk
-    if (remainder < 0 || remainder > capacity_) {
-      fprintf(stderr,
-              "BOUNDS ERROR in write() chunk2: remainder=%d, capacity=%d\n",
-              remainder, capacity_);
-      abort();
-    }
+    FATAL_CHECK(remainder < 0 || remainder > capacity_,
+                "BOUNDS ERROR in write() chunk2: remainder=%d, capacity=%d\n",
+                remainder, capacity_);
     memcpy(&buffer_[0], samples + space_to_end, remainder * sizeof(float));
     write_pos_.store(remainder, std::memory_order_release);
   }
@@ -104,44 +92,33 @@ int AudioRingBuffer::read(float* samples, int count) {
     const int read = read_pos_.load(std::memory_order_acquire);
 
     // BOUNDS CHECK: Validate read position
-    if (read < 0 || read >= capacity_) {
-      fprintf(stderr, "FATAL: read_pos out of bounds! read=%d, capacity=%d\n",
-              read, capacity_);
-      abort();
-    }
+    FATAL_CHECK(read < 0 || read >= capacity_,
+                "read_pos out of bounds! read=%d, capacity=%d\n", read,
+                capacity_);
 
     const int space_to_end = capacity_ - read;
 
     if (to_read <= space_to_end) {
       // Read in one chunk
       // BOUNDS CHECK
-      if (read < 0 || read + to_read > capacity_) {
-        fprintf(stderr,
-                "BOUNDS ERROR in read(): read=%d, to_read=%d, capacity=%d\n",
-                read, to_read, capacity_);
-        abort();
-      }
+      FATAL_CHECK(read < 0 || read + to_read > capacity_,
+                  "BOUNDS ERROR in read(): read=%d, to_read=%d, capacity=%d\n",
+                  read, to_read, capacity_);
       memcpy(samples, &buffer_[read], to_read * sizeof(float));
       read_pos_.store((read + to_read) % capacity_, std::memory_order_release);
     } else {
       // Read in two chunks (wrap around)
       // BOUNDS CHECK - first chunk
-      if (read < 0 || read + space_to_end > capacity_) {
-        fprintf(stderr,
-                "BOUNDS ERROR in read() chunk1: read=%d, space_to_end=%d, "
-                "capacity=%d\n",
-                read, space_to_end, capacity_);
-        abort();
-      }
+      FATAL_CHECK(read < 0 || read + space_to_end > capacity_,
+                  "BOUNDS ERROR in read() chunk1: read=%d, space_to_end=%d, "
+                  "capacity=%d\n",
+                  read, space_to_end, capacity_);
       memcpy(samples, &buffer_[read], space_to_end * sizeof(float));
       const int remainder = to_read - space_to_end;
       // BOUNDS CHECK - second chunk
-      if (remainder < 0 || remainder > capacity_) {
-        fprintf(stderr,
-                "BOUNDS ERROR in read() chunk2: remainder=%d, capacity=%d\n",
-                remainder, capacity_);
-        abort();
-      }
+      FATAL_CHECK(remainder < 0 || remainder > capacity_,
+                  "BOUNDS ERROR in read() chunk2: remainder=%d, capacity=%d\n",
+                  remainder, capacity_);
       memcpy(samples + space_to_end, &buffer_[0], remainder * sizeof(float));
       read_pos_.store(remainder, std::memory_order_release);
     }