From 355ab2cb957bd628de25139ced9e1a5fe9feb2e7 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 23 Jun 2014 17:58:55 -0700
Subject: [PATCH] max desired must be one less than the max frames in our
 ringbuffer

---
 libraries/audio/src/AudioRingBuffer.cpp           | 3 ---
 libraries/audio/src/PositionalAudioRingBuffer.cpp | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp
index 1b6bdaa5d8..71fd2fe19d 100644
--- a/libraries/audio/src/AudioRingBuffer.cpp
+++ b/libraries/audio/src/AudioRingBuffer.cpp
@@ -122,9 +122,6 @@ qint64 AudioRingBuffer::writeData(const char* data, qint64 maxSize) {
 
     int samplesToCopy = std::min((quint64)(maxSize / sizeof(int16_t)), (quint64)_sampleCapacity);
 
-    std::less<int16_t*> less;
-    std::less_equal<int16_t*> lessEqual;
-    
     if (_hasStarted && samplesToCopy > _sampleCapacity - samplesAvailable()) {
         // this read will cross the next output, so call us starved and reset the buffer
         qDebug() << "Filled the ring buffer. Resetting.";
diff --git a/libraries/audio/src/PositionalAudioRingBuffer.cpp b/libraries/audio/src/PositionalAudioRingBuffer.cpp
index a2e0d08b91..2ba407242c 100644
--- a/libraries/audio/src/PositionalAudioRingBuffer.cpp
+++ b/libraries/audio/src/PositionalAudioRingBuffer.cpp
@@ -243,5 +243,9 @@ void PositionalAudioRingBuffer::updateDesiredJitterBufferFrames() {
         if (_desiredJitterBufferFrames < 1) {
             _desiredJitterBufferFrames = 1;
         }
+        const int maxDesired = RING_BUFFER_LENGTH_FRAMES - 1;
+        if (_desiredJitterBufferFrames > maxDesired) {
+            _desiredJitterBufferFrames = maxDesired;
+        }
     }
 }