Remove old Range class, use geompp::Range instead

monocasual · Jan 17, 2024 · 0a0cf0a · 0a0cf0a
1 parent 38134d3
commit 0a0cf0a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 78 deletions.
diff --git a/src/core/quantizer.cpp b/src/core/quantizer.cpp
@@ -45,7 +45,7 @@ void Quantizer::schedule(int id, std::function<void(Frame delta)> f)
 
 /* -------------------------------------------------------------------------- */
 
-void Quantizer::advance(Range<Frame> block, Frame quantizerStep) const
+void Quantizer::advance(geompp::Range<Frame> block, Frame quantizerStep) const
 {
 	/* Nothing to do if there's no action to perform. */
 
@@ -56,7 +56,7 @@ void Quantizer::advance(Range<Frame> block, Frame quantizerStep) const
 
 	assert(m_callbacks.count(pid) > 0);
 
-	for (Frame global = block.getBegin(), local = 0; global < block.getEnd(); global++, local++)
+	for (Frame global = block.a, local = 0; global < block.b; global++, local++)
 	{
 
 		if (global % quantizerStep != 0) // Skip if it's not on a quantization unit.

diff --git a/src/core/quantizer.h b/src/core/quantizer.h
@@ -28,9 +28,9 @@
 #define G_QUANTIZER_H
 
 #include "core/const.h"
-#include "core/range.h"
 #include "core/types.h"
 #include "core/weakAtomic.h"
+#include "deps/geompp/src/range.hpp"
 #include <functional>
 #include <map>
 
@@ -56,7 +56,7 @@ class Quantizer
 	currentFrame + bufferSize) and a quantization step. Call this function
 	on each block. */
 
-	void advance(Range<Frame> block, Frame quantizerStep) const;
+	void advance(geompp::Range<Frame> block, Frame quantizerStep) const;
 
 	/* clear
 	Disables quantized operations in progress, if any. */

diff --git a/src/core/range.h b/src/core/range.h
diff --git a/src/core/rendering/renderer.cpp b/src/core/rendering/renderer.cpp
@@ -111,10 +111,10 @@ void Renderer::render(mcl::AudioBuffer& out, const mcl::AudioBuffer& in, const m
 
 	if (sequencer.isRunning())
 	{
-		const Frame        currentFrame  = sequencer.a_getCurrentFrame();
-		const int          bufferSize    = out.countFrames();
-		const int          quantizerStep = m_sequencer.getQuantizerStep();            // TODO pass this to m_sequencer.advance - or better, Advancer class
-		const Range<Frame> renderRange   = {currentFrame, currentFrame + bufferSize}; // TODO pass this to m_sequencer.advance - or better, Advancer class
+		const Frame                currentFrame  = sequencer.a_getCurrentFrame();
+		const int                  bufferSize    = out.countFrames();
+		const int                  quantizerStep = m_sequencer.getQuantizerStep();            // TODO pass this to m_sequencer.advance - or better, Advancer class
+		const geompp::Range<Frame> renderRange   = {currentFrame, currentFrame + bufferSize}; // TODO pass this to m_sequencer.advance - or better, Advancer class
 
 		const Sequencer::EventBuffer& events = m_sequencer.advance(sequencer, bufferSize, kernelAudio.samplerate, actions);
 		m_sequencer.render(out, layout_RT);
@@ -151,7 +151,7 @@ void Renderer::render(mcl::AudioBuffer& out, const mcl::AudioBuffer& in, const m
 /* -------------------------------------------------------------------------- */
 
 void Renderer::advanceChannels(const Sequencer::EventBuffer& events,
-    const model::Channels& channels, Range<Frame> block, int quantizerStep) const
+    const model::Channels& channels, geompp::Range<Frame> block, int quantizerStep) const
 {
 	for (const Channel& c : channels.getAll())
 		if (!c.isInternal())
@@ -160,7 +160,8 @@ void Renderer::advanceChannels(const Sequencer::EventBuffer& events,
 
 /* -------------------------------------------------------------------------- */
 
-void Renderer::advanceChannel(const Channel& ch, const Sequencer::EventBuffer& events, Range<Frame> block, Frame quantizerStep) const
+void Renderer::advanceChannel(const Channel& ch, const Sequencer::EventBuffer& events,
+    geompp::Range<Frame> block, Frame quantizerStep) const
 {
 	if (ch.shared->quantizer)
 		ch.shared->quantizer->advance(block, quantizerStep);

diff --git a/src/core/rendering/renderer.h b/src/core/rendering/renderer.h
@@ -74,9 +74,9 @@ class Renderer
 	events) in the current audio block. Called when the sequencer is running. */
 
 	void advanceChannels(const Sequencer::EventBuffer&, const model::Channels&,
-	    Range<Frame>, int quantizerStep) const;
+	    geompp::Range<Frame>, int quantizerStep) const;
 
-	void advanceChannel(const Channel&, const Sequencer::EventBuffer&, Range<Frame>, Frame quantizerStep) const;
+	void advanceChannel(const Channel&, const Sequencer::EventBuffer&, geompp::Range<Frame>, Frame quantizerStep) const;
 
 	void renderNormalChannels(const std::vector<Channel>& channels, mcl::AudioBuffer& out,
 	    const mcl::AudioBuffer& in, bool hasSolos, bool seqIsRunning) const;

diff --git a/src/core/sequencer.cpp b/src/core/sequencer.cpp
@@ -162,7 +162,7 @@ const Sequencer::EventBuffer& Sequencer::advance(const model::Sequencer& sequenc
 	/* Advance this and quantizer after the event parsing. */
 
 	sequencer.a_setCurrentFrame(nextFrame, sampleRate);
-	m_quantizer.advance(Range<Frame>(start, end), getQuantizerStep());
+	m_quantizer.advance(geompp::Range<Frame>(start, end), getQuantizerStep());
 
 	return m_eventBuffer;
 }