From 5803c31801c555ddbbd1231570ccf7c3bebedfc6 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 13 Jun 2018 19:06:41 -0400
Subject: [PATCH] Revert "Fixes for new ring buffers..."

This reverts commit 92d27c618b30c491dff038f4796b5cabbc41d673.
---
 src/RingBuffer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/RingBuffer.cpp b/src/RingBuffer.cpp
index bc94e6615..b44753865 100644
--- a/src/RingBuffer.cpp
+++ b/src/RingBuffer.cpp
@@ -31,6 +31,8 @@
 
 #ifdef EXPERIMENTAL_REWRITE_RING_BUFFER
 #define REWRITE_RING_BUFFER
+#elif defined (__APPLE__)
+#define REWRITE_RING_BUFFER
 #endif
 
 namespace {
@@ -160,7 +162,6 @@ size_t RingBuffer::Get(samplePtr buffer, sampleFormat format,
                        size_t samplesToCopy)
 {
 #ifdef REWRITE_RING_BUFFER
-   samplesToCopy = std::min( samplesToCopy, AvailForGet() );
    return PaUtil_ReadRingBuffer(&mRingBuffer, buffer, samplesToCopy);
 #else
    samplesToCopy = std::min( samplesToCopy, Len() );
@@ -187,7 +188,6 @@ size_t RingBuffer::Get(samplePtr buffer, sampleFormat format,
 size_t RingBuffer::Discard(size_t samplesToDiscard)
 {
 #ifdef REWRITE_RING_BUFFER
-   samplesToDiscard = std::min( samplesToDiscard, AvailForGet() );
    PaUtil_AdvanceRingBufferReadIndex(&mRingBuffer, samplesToDiscard);
 #else
    samplesToDiscard = std::min( samplesToDiscard, Len() );