From 3645e38dd55a7703ba39b0b3b9ca71c7a8d09cdd Mon Sep 17 00:00:00 2001
From: michalcourson <mcourson@cusackmusic.com>
Date: Thu, 30 Oct 2025 20:00:55 -0400
Subject: [PATCH] adjustable portamento, fixed adsr

---
 Assets/web/src/App.js      |  1 +
 Source/Shifter.h           |  5 +++++
 Source/WebViewPluginDemo.h | 20 +++++++++++++++++---
 Source/shifter_voice.cpp   |  4 ++--
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/Assets/web/src/App.js b/Assets/web/src/App.js
index 63b5946..fea956d 100644
--- a/Assets/web/src/App.js
+++ b/Assets/web/src/App.js
@@ -420,6 +420,7 @@ function App() {
       <Container>
         <JuceSlider identifier="formantSlider" title="Formant" />
         <JuceSlider identifier="autoTuneSpeedSlider" title="Auto Tune Speed" />
+        <JuceSlider identifier="portTimeSlider" title="Portamento Speed" />
       </Container>
       <CardActions style={{ justifyContent: "center" }}>
         <Button
diff --git a/Source/Shifter.h b/Source/Shifter.h
index 9c40202..4494ac5 100644
--- a/Source/Shifter.h
+++ b/Source/Shifter.h
@@ -84,6 +84,11 @@ public:
     void RemoveMidiNote(int note);
 	void SetFormantPreserve(float val) { formant_preserve = val; }
     void SetAutoTuneSpeed(float val);
+    void SetPortamentoTime(float time) {
+        for (int i = 0; i < MAX_VOICES; ++i) {
+            voices[i].SetPortamentoTime(time);
+        }
+	}
 
     float out_midi = 40;
 
diff --git a/Source/WebViewPluginDemo.h b/Source/WebViewPluginDemo.h
index d2f4566..99ea5bd 100644
--- a/Source/WebViewPluginDemo.h
+++ b/Source/WebViewPluginDemo.h
@@ -64,6 +64,7 @@ namespace ID
 
 	PARAMETER_ID(formantPreserve)
 	PARAMETER_ID(autoTuneSpeed)
+	PARAMETER_ID(portTime)
 		PARAMETER_ID(mute)
 		PARAMETER_ID(filterType)
 
@@ -213,8 +214,13 @@ public:
 			autoTuneSpeed(addToLayout<AudioParameterFloat>(layout,
 				ID::autoTuneSpeed,
 				"AutoTune Speed",
-				NormalisableRange<float> {0.001f, 0.4f, .01f},
+				NormalisableRange<float> {0.001f, 0.4f, .001f},
 				.5f)),
+			portTime(addToLayout<AudioParameterFloat>(layout,
+				ID::portTime,
+				"Portamento Speed",
+				NormalisableRange<float> {0.001f, 0.2f, .001f},
+				.001f)),
 			mute(addToLayout<AudioParameterBool>(layout, ID::mute, "Mute", false)),
 			filterType(addToLayout<AudioParameterChoice>(layout,
 				ID::filterType,
@@ -226,6 +232,7 @@ public:
 
 		AudioParameterFloat& formantPreserve;
 		AudioParameterFloat& autoTuneSpeed;
+		AudioParameterFloat& portTime;
 		AudioParameterBool& mute;
 		AudioParameterChoice& filterType;
 
@@ -320,6 +327,7 @@ void WebViewPluginAudioProcessor::processBlock(juce::AudioBuffer<float>& buffer,
 		buffer.clear(i, 0, buffer.getNumSamples());
 	shifter.SetFormantPreserve(parameters.formantPreserve.get());
 	shifter.SetAutoTuneSpeed(parameters.autoTuneSpeed.get());
+	shifter.SetPortamentoTime(parameters.portTime.get());
 	juce::AudioBuffer<float> const_buff;
 	const_buff.makeCopyOf(buffer);
 	shifter.Process(const_buff.getArrayOfReadPointers(), (float**)buffer.getArrayOfWritePointers(), buffer.getNumSamples());
@@ -466,6 +474,7 @@ private:
 
 	WebSliderRelay       formantSliderRelay{ "formantSlider" };
 	WebSliderRelay       autoTuneSpeedSliderRelay{ "autoTuneSpeedSlider" };
+	WebSliderRelay       portTimeSliderRelay{ "portTimeSlider" };
 	WebToggleButtonRelay muteToggleRelay{ "muteToggle" };
 	WebComboBoxRelay     filterTypeComboRelay{ "filterTypeCombo" };
 
@@ -478,6 +487,7 @@ private:
 										 .withNativeIntegrationEnabled()
 										 .withOptionsFrom(formantSliderRelay)
 										 .withOptionsFrom(autoTuneSpeedSliderRelay)
+										 .withOptionsFrom(portTimeSliderRelay)
 										 .withOptionsFrom(muteToggleRelay)
 										 .withOptionsFrom(filterTypeComboRelay)
 										 .withOptionsFrom(controlParameterIndexReceiver)
@@ -493,6 +503,7 @@ private:
 
 	WebSliderParameterAttachment       formantAttachment;
 	WebSliderParameterAttachment       autoTuneSpeedAttachment;
+	WebSliderParameterAttachment       portTimeAttachment;
 	WebToggleButtonParameterAttachment muteAttachment;
 	WebComboBoxParameterAttachment     filterTypeAttachment;
 
@@ -624,6 +635,9 @@ WebViewPluginAudioProcessorEditor::WebViewPluginAudioProcessorEditor(WebViewPlug
 	autoTuneSpeedAttachment(*processorRef.state.getParameter(ID::autoTuneSpeed.getParamID()),
 		autoTuneSpeedSliderRelay,
 		processorRef.state.undoManager),
+	portTimeAttachment(*processorRef.state.getParameter(ID::portTime.getParamID()),
+		portTimeSliderRelay,
+		processorRef.state.undoManager),
 	muteAttachment(*processorRef.state.getParameter(ID::mute.getParamID()),
 		muteToggleRelay,
 		processorRef.state.undoManager),
@@ -633,8 +647,8 @@ WebViewPluginAudioProcessorEditor::WebViewPluginAudioProcessorEditor(WebViewPlug
 {
 	addAndMakeVisible(webComponent);
 
-	//webComponent.goToURL(localDevServerAddress);
-	webComponent.goToURL (WebBrowserComponent::getResourceProviderRoot());
+	webComponent.goToURL(localDevServerAddress);
+	//webComponent.goToURL (WebBrowserComponent::getResourceProviderRoot());
 
 	setSize(500, 500);
 
diff --git a/Source/shifter_voice.cpp b/Source/shifter_voice.cpp
index 4991a35..4250c56 100644
--- a/Source/shifter_voice.cpp
+++ b/Source/shifter_voice.cpp
@@ -21,8 +21,8 @@ void ShifterVoice::Init(float sample_rate) {
 	portamento_.Init(sample_rate, 0.05f); //default portamento time
 	amplitude_envelope_.Init(sample_rate);
 	amplitude_envelope_.SetAttackTime(0.2f);
-	amplitude_envelope_.SetDecayTime(0.2f);	
-	amplitude_envelope_.SetReleaseTime(1.0f);
+	amplitude_envelope_.SetDecayTime(0.1f);	
+	amplitude_envelope_.SetReleaseTime(.1f);
 	onoff_ = false;
 	overflow_ = false;
 	current_midi = 60;