From bc0e18391aaefcf440153f59b9b4750e711f68f1 Mon Sep 17 00:00:00 2001
From: jsiegle <jsiegle@mit.edu>
Date: Mon, 27 Jan 2014 21:49:07 -0500
Subject: [PATCH] Split number of items to read from buffer into two lines
---
Source/Processors/DataThreads/DataBuffer.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Source/Processors/DataThreads/DataBuffer.cpp b/Source/Processors/DataThreads/DataBuffer.cpp
index fd3f618a8..eb16a1d80 100755
--- a/Source/Processors/DataThreads/DataBuffer.cpp
+++ b/Source/Processors/DataThreads/DataBuffer.cpp
@@ -79,8 +79,14 @@ int DataBuffer::getNumSamples()
int DataBuffer::readAllFromBuffer(AudioSampleBuffer& data, uint64* timestamp, int16* eventCodes, int maxSize)
{
// check to see if the maximum size is smaller than the total number of available ints
- int numItems = (maxSize < abstractFifo.getNumReady()) ?
- maxSize : abstractFifo.getNumReady();
+
+ // Better version (1/27/14)?
+ int numReady = abstractFifo.getNumReady());
+ int numItems = (maxSize < numReady ) ? maxSize : numReady;
+
+ // Original version:
+ //int numItems = (maxSize < abstractFifo.getNumReady()) ?
+ // maxSize : abstractFifo.getNumReady();
int startIndex1, blockSize1, startIndex2, blockSize2;
abstractFifo.prepareToRead(numItems, startIndex1, blockSize1, startIndex2, blockSize2);
--
GitLab