Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 22:12:58 +02:00
Code Issues Releases Wiki Activity

Revert "Fixes for new ring buffers..."

Browse Source 
This reverts commit 92d27c618b.
This commit is contained in:
Paul Licameli
2018-06-13 19:06:41 -04:00
parent 66a87ecaa9
commit 5803c31801
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/RingBuffer.cpp
View File

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