From 4abe64f2b8364956746a7b5d9221207dd7f74d2d Mon Sep 17 00:00:00 2001 From: wardio Date: Wed, 31 Aug 2022 20:55:46 +0100 Subject: [PATCH 1/3] Simplifying modularDistance function --- src/utilities.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/utilities.cpp b/src/utilities.cpp index e4a3561d..0581baed 100644 --- a/src/utilities.cpp +++ b/src/utilities.cpp @@ -2,18 +2,8 @@ #include -double modularDistance(double a0, double b0, double mod) { - double a, b; - if (a0 < b0) { - a = a0; - b = b0; - } - else { - a = b0; - b = a0; - } - - return std::fmin(b - a, a + mod - b); +double modularDistance(double a, double b, double mod) { + return (a < b) ? std::fmin(b - a, a + mod - b) : std::fmin(a - b, b + mod - a); } double positiveMod(double x, double mod) { From 482d9335645df9e887f8b0a74256a46af1ec6628 Mon Sep 17 00:00:00 2001 From: wardio Date: Wed, 31 Aug 2022 20:57:21 +0100 Subject: [PATCH 2/3] Correct typo in 'checkForDiscontinuitiy' --- include/audio_buffer.h | 2 +- src/audio_buffer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/audio_buffer.h b/include/audio_buffer.h index 857f7c88..83b51ee3 100644 --- a/include/audio_buffer.h +++ b/include/audio_buffer.h @@ -67,7 +67,7 @@ class AudioBuffer { } } - bool checkForDiscontinuitiy(int threshold) const; + bool checkForDiscontinuity(int threshold) const; int m_writePointer; diff --git a/src/audio_buffer.cpp b/src/audio_buffer.cpp index 3abf862f..e4ae1259 100644 --- a/src/audio_buffer.cpp +++ b/src/audio_buffer.cpp @@ -30,7 +30,7 @@ void AudioBuffer::destroy() { m_bufferSize = 0; } -bool AudioBuffer::checkForDiscontinuitiy(int threshold) const { +bool AudioBuffer::checkForDiscontinuity(int threshold) const { for (int i = 0; i < m_bufferSize - 1; ++i) { const int i0 = getBufferIndex(i + m_writePointer); const int i1 = getBufferIndex(i0 + 1); From 47f1415f5faabbf714020219aea9b9ee769d430f Mon Sep 17 00:00:00 2001 From: wardio Date: Wed, 31 Aug 2022 20:59:53 +0100 Subject: [PATCH 3/3] Improving efficiency of checkForDiscontinuity func --- src/audio_buffer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/audio_buffer.cpp b/src/audio_buffer.cpp index e4ae1259..e81d43e3 100644 --- a/src/audio_buffer.cpp +++ b/src/audio_buffer.cpp @@ -31,7 +31,9 @@ void AudioBuffer::destroy() { } bool AudioBuffer::checkForDiscontinuity(int threshold) const { - for (int i = 0; i < m_bufferSize - 1; ++i) { + int i = 0; + int m_bufferSizeMinusOne = m_bufferSize - 1; + for (; i < m_bufferSizeMinusOne; ++i) { const int i0 = getBufferIndex(i + m_writePointer); const int i1 = getBufferIndex(i0 + 1);