Fadeout repeated notes option (default off)

Author: tlr

src/PluginEditor.cpp

@@ -966,6 +966,7 @@ void RipplerXAudioProcessorEditor::showSettingsMenu()
 {
     bool stereoizer = (bool)audioProcessor.params.getRawParameterValue("stereoizer")->load();
     bool reuseVoices = (bool)audioProcessor.params.getRawParameterValue("reuse_voices")->load();
+    bool fadeoutRepeats = (bool)audioProcessor.params.getRawParameterValue("fadeout_repeats")->load();
 
     PopupMenu menu;
     PopupMenu scaleMenu;
@@ -977,6 +978,7 @@ void RipplerXAudioProcessorEditor::showSettingsMenu()
 
     PopupMenu polyphonyMenu;
     polyphonyMenu.addItem(10, "Reuse voices on repeated notes", true, reuseVoices);
+    polyphonyMenu.addItem(12, "Fadeout repeated notes", reuseVoices, fadeoutRepeats);
 
     menu.addSubMenu("UI Scale", scaleMenu);
     menu.addSubMenu("Polyphony", polyphonyMenu);
@@ -985,7 +987,7 @@ void RipplerXAudioProcessorEditor::showSettingsMenu()
     auto menuPos = localPointToGlobal(settingsBtn.getBounds().getBottomRight());
     menu.showMenuAsync(PopupMenu::Options()
         .withTargetScreenArea({ menuPos.getX() - 125, menuPos.getY(), 1, 1 }),
-        [this, stereoizer, reuseVoices](int result) {
+        [this, stereoizer, reuseVoices, fadeoutRepeats](int result) {
             if (result == 0) return;
             if (result == 1) audioProcessor.setScale(1.f);
             if (result == 2) audioProcessor.setScale(1.25f);
@@ -1004,6 +1006,10 @@ void RipplerXAudioProcessorEditor::showSettingsMenu()
                 auto param = audioProcessor.params.getParameter("stereoizer");
                 param->setValueNotifyingHost(stereoizer ? 0.f : 1.f);
             }
+            if (result == 12) {
+                auto param = audioProcessor.params.getParameter("fadeout_repeats");
+                param->setValueNotifyingHost(fadeoutRepeats ? 0.f : 1.f);
+            }
         });
 }
 

src/PluginProcessor.cpp

@@ -93,6 +93,7 @@ RipplerXAudioProcessor::RipplerXAudioProcessor()
         std::make_unique<juce::AudioParameterInt>("bend_range", "PitchBend Range", 1, 24, 2),
         std::make_unique<juce::AudioParameterBool>("stereoizer", "Stereoizer", true),
         std::make_unique<juce::AudioParameterBool>("reuse_voices", "Reuse Voices", false),
+        std::make_unique<juce::AudioParameterBool>("fadeout_repeats", "Fadeout Repeated Notes", false),
     }),
     mtsClientPtr{nullptr}
 #endif
@@ -383,19 +384,24 @@ bool RipplerXAudioProcessor::isBusesLayoutSupported (const BusesLayout& layouts)
 // Sort the array by release time if the note is not pressed, otherwise sort by press time.
 // The release time sort should take priority over press time sort.
 int RipplerXAudioProcessor::pickVoice(int note) {
-    int pick = 0;
     bool reuseVoices = (bool)params.getRawParameterValue("reuse_voices")->load();
 
+    // Priority 1: note already playing in a voice
+    if (reuseVoices) {
+        for (int i = 0; i < polyphony; ++i) {
+            if (voices[i]->note == note) {
+                return i;
+            }
+        }
+    }
+
+    int pick = 0;
     for (int i = 1; i < polyphony; ++i) {
         const auto& v1 = voices[i];
         const auto& v2 = voices[pick];
 
-        if (v1->note == note && reuseVoices) {
-            pick = i;
-            break;
-        }
         // Priority 2: Released voices come before pressed ones
-        else if (!v1->isPressed && v2->isPressed) {
+        if (!v1->isPressed && v2->isPressed) {
             pick = i;
         }
         else if (v1->isPressed && !v2->isPressed) {
@@ -419,16 +425,19 @@ void RipplerXAudioProcessor::onNote(MIDIMsg msg)
     auto srate = getSampleRate();
 
     int nvoice = pickVoice(msg.note);
-    DBG("" << nvoice);
     Voice& voice = *voices[nvoice];
 
+    bool reuse_voices = (bool)params.getRawParameterValue("reuse_voices")->load();
+    bool fadeout_repeats = (bool)params.getRawParameterValue("fadeout_repeats")->load();
+    bool skip_fadeout = reuse_voices && !fadeout_repeats && voice.note == msg.note;
+
     auto mallet_type = (MalletType)params.getRawParameterValue("mallet_type")->load();
     auto mallet_stiff = (double)params.getRawParameterValue("mallet_stiff")->load();
     auto mallet_ktrack = (double)params.getRawParameterValue("mallet_ktrack")->load();
     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, mtsClientPtr);
+    voice.trigger(srate, msg.note, msg.vel / 127.0, mallet_type, malletFreq, mallet_ktrack, skip_fadeout, mtsClientPtr);
 }
 
 void RipplerXAudioProcessor::offNote(MIDIMsg msg)

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, MTSClient* mts)
+void Voice::trigger(double _srate, int _note, double _vel, MalletType _malletType, double _malletFreq, double _mallet_ktrack, bool skip_fadeout, MTSClient* mts)
 {
 	srate = _srate;
 	malletType = _malletType;
@@ -27,14 +27,17 @@ void Voice::trigger(double _srate, int _note, double _vel, MalletType _malletTyp
 	malletKtrack = _mallet_ktrack;
 
 	// fade out active voice before re-triggering
-	if (((resA.on && resA.active) || (resB.on && resB.active))) {
+	if (skip_fadeout) {
+		triggerStart(false);
+	}
+	else if (((resA.on && resA.active) || (resB.on && resB.active))) {
 		isFading = true;
 		fadeTotalSamples = (int)(globals::REPEAT_NOTE_FADE_MS * 0.001 * srate);
 		fadeSamples = fadeTotalSamples;
 		updateResonators();
 	}
 	else {
-		triggerStart();
+		triggerStart(true);
 	}
 }
 
@@ -43,15 +46,17 @@ double Voice::fadeOut()
 	fadeSamples--;
 	if (fadeSamples <= 0) {
 		isFading = false;
-		triggerStart();
+		triggerStart(true);
 	}
 	return isFading ? (double)fadeSamples / (double)fadeTotalSamples : 1.0;
 }
 
-void Voice::triggerStart()
+void Voice::triggerStart(bool reset)
 {
-	resA.clear();
-	resB.clear();
+	if (reset) {
+		resA.clear();
+		resB.clear();
+	}
 	isRelease = false;
 	isPressed = true;
 	pressed_ts = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();

src/dsp/Voice.h

@@ -25,8 +25,8 @@ class Voice
 	~Voice() {}
 
 	double note2freq(int _note, MTSClient *mts);
-	void trigger(double srate, int _note, double vel, MalletType malletType, double malletFreq, double malletKTrack, MTSClient *mts);
-	void triggerStart();
+	void trigger(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 clear();