polyphony fix timestamps of notes pressed at the same time

Author: tlr

CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 option(BUILD_STANDALONE "Build Standalone plugin format" ON) # Allow overriding from the command line
 
-project(RipplerX VERSION 1.5.17)
+project(RipplerX VERSION 1.5.18)
 
 add_compile_definitions(PROJECT_VERSION="${PROJECT_VERSION}")
 set(CMAKE_CXX_STANDARD 17)

src/PluginProcessor.cpp

@@ -437,15 +437,15 @@ void RipplerXAudioProcessor::onNote(MIDIMsg msg)
     auto vel_mallet_stiff = (double)params.getRawParameterValue("vel_mallet_stiff")->load();
     auto malletFreq = fmax(100.0, fmin(5000.0, exp(log(mallet_stiff) + msg.vel / 127.0 * vel_mallet_stiff * 2.0 * (log(5000.0) - log(100.0)))));
 
-    voice.trigger(srate, msg.note, msg.vel / 127.0, mallet_type, malletFreq, mallet_ktrack, skip_fadeout, mtsClientPtr);
+    voice.trigger(++note_press_count, srate, msg.note, msg.vel / 127.0, mallet_type, malletFreq, mallet_ktrack, skip_fadeout, mtsClientPtr);
 }
 
 void RipplerXAudioProcessor::offNote(MIDIMsg msg)
 {
     for (int i = 0; i < polyphony; ++i) {
         Voice& voice = *voices[i];
         if (voice.note == msg.note && !voice.isRelease) {
-            voice.release();
+            voice.release(++note_release_count);
         }
     }
 }

src/PluginProcessor.h

@@ -56,6 +56,8 @@ class RipplerXAudioProcessor  : public juce::AudioProcessor, public juce::AudioP
     MTSClient *mtsClientPtr;
     MalletType l_mallet_type = MalletType::kImpulse; // used to detect mallet type changes
     bool sustainPedal = false;
+    uint64_t note_press_count = 0;
+    uint64_t note_release_count = 0;
     // pitch bend
     double bendStep = 0.1;
     double startBend = 1.0;

src/dsp/Voice.cpp

@@ -15,7 +15,7 @@ double Voice::note2freq(int _note, MTSClient *mts)
 }
 
 // Triggers mallet and noise generator
-void Voice::trigger(double _srate, int _note, double _vel, MalletType _malletType, double _malletFreq, double _mallet_ktrack, bool skip_fadeout, MTSClient* mts)
+void Voice::trigger(uint64_t timestamp, double _srate, int _note, double _vel, MalletType _malletType, double _malletFreq, double _mallet_ktrack, bool skip_fadeout, MTSClient* mts)
 {
 	srate = _srate;
 	malletType = _malletType;
@@ -26,6 +26,10 @@ void Voice::trigger(double _srate, int _note, double _vel, MalletType _malletTyp
 	newFreq = note2freq(newNote, mts);
 	malletKtrack = _mallet_ktrack;
 
+	isRelease = false;
+	isPressed = true;
+	pressed_ts = timestamp;
+
 	// fade out active voice before re-triggering
 	if (skip_fadeout) {
 		triggerStart(false);
@@ -57,9 +61,6 @@ void Voice::triggerStart(bool reset)
 		resA.clear();
 		resB.clear();
 	}
-	isRelease = false;
-	isPressed = true;
-	pressed_ts = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
 	note = newNote;
 	vel = newVel;
 	freq = newFreq;
@@ -71,11 +72,11 @@ void Voice::triggerStart(bool reset)
 	updateResonators();
 }
 
-void Voice::release()
+void Voice::release(uint64_t timestamp)
 {
 	isRelease = true;
 	isPressed = false;
-	release_ts = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
+	release_ts = timestamp;
 	noise.release();
 	updateResonators();
 }

src/dsp/Voice.h

@@ -6,7 +6,6 @@
 
 #pragma once
 #include <array>
-#include <chrono>
 #include "Mallet.h"
 #include "Noise.h"
 #include "Resonator.h"
@@ -25,10 +24,10 @@ class Voice
 	~Voice() {}
 
 	double note2freq(int _note, MTSClient *mts);
-	void trigger(double srate, int _note, double vel, MalletType malletType, double malletFreq, double malletKTrack, bool skip_fade, MTSClient *mts);
+	void trigger(uint64_t timestamp, double srate, int _note, double vel, MalletType malletType, double malletFreq, double malletKTrack, bool skip_fade, MTSClient *mts);
 	void triggerStart(bool reset);
 	double fadeOut();
-	void release();
+	void release(uint64_t timestamp);
 	void clear();
 	void setPitch(double a_coarse, double b_coarse, double a_fine, double b_fine, double pitch_bend);
 	void setRatio(double _a_ratio, double _b_ratio);
@@ -54,8 +53,8 @@ class Voice
 	double srate = 44100.0;
 	double a_ratio = 1.0; // used to recalculate models
 	double b_ratio = 1.0; // used to recalculate models
-	int64_t pressed_ts = 0; // timestamp used to order notes
-	int64_t release_ts = 0; // timestamp used to order notes
+	uint64_t pressed_ts = 0; // timestamp used to order notes
+	uint64_t release_ts = 0; // timestamp used to order notes
 
 	// used to fade out on repeat notes
 	bool isFading = false;