remove std::function usage in process

re #18228
Cycling74 · May 30, 2023 · dd23360 · dd23360
1 parent 75fddac
commit dd23360
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 29 deletions.
diff --git a/RNBO_JuceAudioProcessor.cpp b/RNBO_JuceAudioProcessor.cpp
@@ -461,32 +461,30 @@ bool JuceAudioProcessor::isBusesLayoutSupported (const BusesLayout& /*layouts*/)
 void JuceAudioProcessor::processBlock (juce::AudioBuffer<float>& buffer, juce::MidiBuffer& midiMessages)
 {
 	auto samples = static_cast<Index>(buffer.getNumSamples());
-	wrapProcess(samples, midiMessages, [this, samples, &buffer]() {
-			_rnboObject.process(
-					buffer.getArrayOfReadPointers(), static_cast<Index>(buffer.getNumChannels()),
-					buffer.getArrayOfWritePointers(), static_cast<Index>(buffer.getNumChannels()),
-					samples,
-					&_midiInput, &_midiOutput
-					);
-			}
+	auto tc = preProcess(midiMessages);
+	_rnboObject.process(
+			buffer.getArrayOfReadPointers(), static_cast<Index>(buffer.getNumChannels()),
+			buffer.getArrayOfWritePointers(), static_cast<Index>(buffer.getNumChannels()),
+			samples,
+			&_midiInput, &_midiOutput
 			);
+	postProcess(tc, midiMessages);
 }
 
 void JuceAudioProcessor::processBlock (juce::AudioBuffer<double>& buffer, juce::MidiBuffer& midiMessages)
 {
 	auto samples = static_cast<Index>(buffer.getNumSamples());
-	wrapProcess(samples, midiMessages, [this, samples, &buffer]() {
-			_rnboObject.process(
-					buffer.getArrayOfReadPointers(), static_cast<Index>(buffer.getNumChannels()),
-					buffer.getArrayOfWritePointers(), static_cast<Index>(buffer.getNumChannels()),
-					samples,
-					&_midiInput, &_midiOutput
-					);
-			}
+	auto tc = preProcess(midiMessages);
+	_rnboObject.process(
+			buffer.getArrayOfReadPointers(), static_cast<Index>(buffer.getNumChannels()),
+			buffer.getArrayOfWritePointers(), static_cast<Index>(buffer.getNumChannels()),
+			samples,
+			&_midiInput, &_midiOutput
 			);
+	postProcess(tc, midiMessages);
 }
 
-void JuceAudioProcessor::wrapProcess(Index numSamples, juce::MidiBuffer& midiMessages, std::function<void(void)> process) {
+TimeConverter JuceAudioProcessor::preProcess(juce::MidiBuffer& midiMessages) {
 	RNBO::MillisecondTime time = _rnboObject.getCurrentTime();
 
 	//transport
@@ -527,28 +525,27 @@ void JuceAudioProcessor::wrapProcess(Index numSamples, juce::MidiBuffer& midiMes
 		}
 	}
 
-	// fill midi input
 	TimeConverter timeConverter(_rnboObject.getSampleRate(), time);
 
+	// fill midi input
 	_midiInput.clear();  // make sure midi input starts clear
 	for (auto meta: midiMessages)
 	{
 		MillisecondTime t = timeConverter.convertSampleOffsetToMilliseconds(meta.samplePosition);
 		_midiInput.addEvent(MidiEvent(t, 0, meta.data, (Index)meta.numBytes));
 	}
+	midiMessages.clear();		// clear the input that we consumed above so juce doesn't get confused
+	return timeConverter;
+}
 
-	process();
-
+void JuceAudioProcessor::postProcess(TimeConverter& timeConverter, juce::MidiBuffer& midiMessages) {
 	// consume midi output
-	midiMessages.clear();		// clear the input that we consumed above so juce doesn't get confused
 	if (!_midiOutput.empty()) {
-		std::for_each(_midiOutput.begin(),
-					  _midiOutput.end(),
-					  [&timeConverter, &midiMessages](const MidiEvent& ev) {
-						  int sampleNumber = static_cast<int>(timeConverter.convertMillisecondsToSampleOffset(ev.getTime()));
-						  auto midiMessage = MidiMessage(ev.getData(), (int)ev.getLength());
-						  midiMessages.addEvent(midiMessage, sampleNumber);
-					  });
+		for (const auto& ev: _midiOutput) {
+			int sampleNumber = static_cast<int>(timeConverter.convertMillisecondsToSampleOffset(ev.getTime()));
+			auto midiMessage = MidiMessage(ev.getData(), (int)ev.getLength());
+			midiMessages.addEvent(midiMessage, sampleNumber);
+		}
 		_midiOutput.clear();
 	}
 }

diff --git a/RNBO_JuceAudioProcessor.h b/RNBO_JuceAudioProcessor.h
@@ -13,6 +13,7 @@
 
 #include "RNBO.h"
 #include "RNBO_BinaryData.h"
+#include "RNBO_TimeConverter.h"
 #include <unordered_map>
 #include <vector>
 #include <mutex>
@@ -142,7 +143,8 @@ namespace RNBO {
 	private:
 		void loadDataRef(const juce::String refName, const juce::String fileName, std::unique_ptr<juce::AudioFormatReader> reader);
 
-		void wrapProcess(Index numSamples, juce::MidiBuffer& midiMessages, std::function<void(void)> process);
+		TimeConverter preProcess(juce::MidiBuffer& midiMessages);
+		void postProcess(TimeConverter& timeConverter, juce::MidiBuffer& midiMessages);
 
 		class SyncEventHandler : public RNBO::EventHandler
 		{