Split utilities

test/CMakeLists.txt

@@ -2,7 +2,7 @@ enable_testing()
 
 add_executable(unit_tests)
 target_sources(unit_tests PRIVATE
-        ConvolverUtilitiesTests.cpp
+        SplitBlockTests.cpp
         ComplexBufferTests.cpp
 )
 

test/ComplexBufferTests.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include <melatonin_test_helpers/melatonin_test_helpers.h>
-#include <zones_convolver/ConvolverUtilities.h>
+#include <zones_convolver/util/ComplexBuffer.h>
 
 SCENARIO ("can construct complex buffers with different channel and point sizes", "[ComplexBuffer]")
 {

test/ConvolverUtilitiesTests.cpp → test/SplitBlockTests.cpp

@@ -1,7 +1,6 @@
-#include <zones_convolver/ConvolverUtilities.h>
-
 #include <catch2/catch_test_macros.hpp>
 #include <melatonin_test_helpers/melatonin_test_helpers.h>
+#include <zones_convolver/util/SplitBlock.h>
 
 SCENARIO ("split blocks can be cleared", "[SplitBlock]")
 {

zones_convolver/util/CircularBuffer.cpp

@@ -0,0 +1,19 @@
+#include "CircularBuffer.h"
+
+CircularBuffer::CircularBuffer (juce::AudioBuffer<float> & buffer)
+    : buffer_ (buffer)
+{
+}
+
+SplitBlock CircularBuffer::GetNext (std::size_t advancement)
+{
+    juce::dsp::AudioBlock<float> block {buffer_};
+    auto num_samples = buffer_.getNumSamples ();
+    head_position_ = (head_position_ + advancement) % num_samples;
+
+    auto first_samples_to_take = num_samples - head_position_;
+    auto wrapped_samples_to_take = num_samples - first_samples_to_take;
+
+    return {block.getSubBlock (head_position_, first_samples_to_take),
+            block.getSubBlock (0, wrapped_samples_to_take)};
+}

zones_convolver/util/CircularBuffer.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "SplitBlock.h"
+
+#include <juce_dsp/juce_dsp.h>
+
+class CircularBuffer
+{
+public:
+    explicit CircularBuffer (juce::AudioBuffer<float> & buffer);
+    SplitBlock GetNext (std::size_t advancement);
+
+private:
+    std::size_t head_position_ = 0;
+    juce::AudioBuffer<float> & buffer_;
+};