Reset smoothed params when note is first triggered

nickdowell · AnClark · commit 0b0e8524459a · 2022-12-31T12:32:04.000+08:00
Fixes DISTRHO#196
diff --git a/NEWS b/NEWS
@@ -1,6 +1,7 @@
 amsynth TBD
 
   - Added PatriksBank04 and PatriksBank05.
+  - Fixed click when playing a note for the first time - issue #196
   - Stopped vendoring lv2 headers; install lv2-dev (or similar) via your package manager.
 
 
diff --git a/src/VoiceAllocationUnit.cpp b/src/VoiceAllocationUnit.cpp
@@ -1,7 +1,7 @@
 /*
  *  VoiceAllocationUnit.cpp
  *
- *  Copyright (c) 2001-2019 Nick Dowell
+ *  Copyright (c) 2001-2021 Nick Dowell
  *
  *  This file is part of amsynth.
  *
@@ -162,7 +162,7 @@ VoiceAllocationUnit::HandleMidiNoteOn(int note, float velocity)
 			_voices[note]->reset();
 		
 		_voices[note]->setVelocity(velocity);
-		_voices[note]->triggerOn();
+		_voices[note]->triggerOn(true);
 		
 		active[note] = true;
 	}
@@ -186,7 +186,7 @@ VoiceAllocationUnit::HandleMidiNoteOn(int note, float velocity)
 		voice->setFrequency(voice->getFrequency(), pitch, portamentoTime);
 		
 		if (_keyboardMode == KeyboardModeMono || previousNote == -1)
-			voice->triggerOn();
+			voice->triggerOn(!active[0]);
 		
 		active[0] = true;
 	}
@@ -243,7 +243,7 @@ VoiceAllocationUnit::HandleMidiNoteOff(int note, float /*velocity*/)
 		if (0 <= nextNote) {
 			voice->setFrequency(voice->getFrequency(), (float) noteToPitch(nextNote), mPortamentoTime);
 			if (_keyboardMode == KeyboardModeMono)
-				voice->triggerOn();
+				voice->triggerOn(false);
 		} else {
 			voice->triggerOff();
 		}
diff --git a/src/VoiceBoard/Synth--.h b/src/VoiceBoard/Synth--.h
@@ -1,7 +1,7 @@
 /*
  *  Synth--.h
  *
- *  Copyright (c) 2001-2012 Nick Dowell
+ *  Copyright (c) 2001-2021 Nick Dowell
  *
  *  This file is part of amsynth.
  *
@@ -165,6 +165,11 @@ class SmoothedParam
 	{
 		return _rawValue;
 	}
+
+	void reset()
+	{
+		_smoother.set(_rawValue);
+	}
 	
 	inline float tick()
 	{
diff --git a/src/VoiceBoard/VoiceBoard.cpp b/src/VoiceBoard/VoiceBoard.cpp
@@ -1,7 +1,7 @@
 /*
  *  VoiceBoard.cpp
  *
- *  Copyright (c) 2001-2020 Nick Dowell
+ *  Copyright (c) 2001-2021 Nick Dowell
  *
  *  This file is part of amsynth.
  *
@@ -221,8 +221,14 @@ VoiceBoard::isSilent()
 }
 
 void 
-VoiceBoard::triggerOn()
+VoiceBoard::triggerOn(bool reset)
 {
+	if (reset) {
+		mOscMix.reset();
+		mRingModAmt.reset();
+		mAmpModAmount.reset();
+		mAmpVelSens.reset();
+	}
 	mAmpADSR.triggerOn();
 	mFilterADSR.triggerOn();
 }
diff --git a/src/VoiceBoard/VoiceBoard.h b/src/VoiceBoard/VoiceBoard.h
@@ -1,7 +1,7 @@
 /*
  *  VoiceBoard.h
  *
- *  Copyright (c) 2001-2020 Nick Dowell
+ *  Copyright (c) 2001-2021 Nick Dowell
  *
  *  This file is part of amsynth.
  *
@@ -42,7 +42,7 @@ class VoiceBoard
 	static constexpr int kMaxProcessBufferSize = 64;
 
 	bool	isSilent		();
-	void	triggerOn		();
+	void	triggerOn		(bool reset);
 	void	triggerOff		();
 	void	setVelocity		(float velocity);
 	

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* VoiceAllocationUnit.cpp`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2001-2019 Nick Dowell`
	`4`	`+ * Copyright (c) 2001-2021 Nick Dowell`
`5`	`5`	`*`
`6`	`6`	`* This file is part of amsynth.`
`7`	`7`	`*`
`@@ -162,7 +162,7 @@ VoiceAllocationUnit::HandleMidiNoteOn(int note, float velocity)`
`162`	`162`	`_voices[note]->reset();`
`163`	`163`
`164`	`164`	`_voices[note]->setVelocity(velocity);`
`165`		`- _voices[note]->triggerOn();`
	`165`	`+ _voices[note]->triggerOn(true);`
`166`	`166`
`167`	`167`	`active[note] = true;`
`168`	`168`	`}`
`@@ -186,7 +186,7 @@ VoiceAllocationUnit::HandleMidiNoteOn(int note, float velocity)`
`186`	`186`	`voice->setFrequency(voice->getFrequency(), pitch, portamentoTime);`
`187`	`187`
`188`	`188`	`if (_keyboardMode == KeyboardModeMono \|\| previousNote == -1)`
`189`		`- voice->triggerOn();`
	`189`	`+ voice->triggerOn(!active[0]);`
`190`	`190`
`191`	`191`	`active[0] = true;`
`192`	`192`	`}`
`@@ -243,7 +243,7 @@ VoiceAllocationUnit::HandleMidiNoteOff(int note, float /velocity/)`
`243`	`243`	`if (0 <= nextNote) {`
`244`	`244`	`voice->setFrequency(voice->getFrequency(), (float) noteToPitch(nextNote), mPortamentoTime);`
`245`	`245`	`if (_keyboardMode == KeyboardModeMono)`
`246`		`- voice->triggerOn();`
	`246`	`+ voice->triggerOn(false);`
`247`	`247`	`} else {`
`248`	`248`	`voice->triggerOff();`
`249`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* Synth--.h`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2001-2012 Nick Dowell`
	`4`	`+ * Copyright (c) 2001-2021 Nick Dowell`
`5`	`5`	`*`
`6`	`6`	`* This file is part of amsynth.`
`7`	`7`	`*`
`@@ -165,6 +165,11 @@ class SmoothedParam`
`165`	`165`	`{`
`166`	`166`	`return _rawValue;`
`167`	`167`	`}`
	`168`	`+`
	`169`	`+ void reset()`
	`170`	`+ {`
	`171`	`+ _smoother.set(_rawValue);`
	`172`	`+ }`
`168`	`173`
`169`	`174`	`inline float tick()`
`170`	`175`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* VoiceBoard.cpp`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2001-2020 Nick Dowell`
	`4`	`+ * Copyright (c) 2001-2021 Nick Dowell`
`5`	`5`	`*`
`6`	`6`	`* This file is part of amsynth.`
`7`	`7`	`*`
`@@ -221,8 +221,14 @@ VoiceBoard::isSilent()`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`void`
`224`		`-VoiceBoard::triggerOn()`
	`224`	`+VoiceBoard::triggerOn(bool reset)`
`225`	`225`	`{`
	`226`	`+ if (reset) {`
	`227`	`+ mOscMix.reset();`
	`228`	`+ mRingModAmt.reset();`
	`229`	`+ mAmpModAmount.reset();`
	`230`	`+ mAmpVelSens.reset();`
	`231`	`+ }`
`226`	`232`	`mAmpADSR.triggerOn();`
`227`	`233`	`mFilterADSR.triggerOn();`
`228`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* VoiceBoard.h`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2001-2020 Nick Dowell`
	`4`	`+ * Copyright (c) 2001-2021 Nick Dowell`
`5`	`5`	`*`
`6`	`6`	`* This file is part of amsynth.`
`7`	`7`	`*`
`@@ -42,7 +42,7 @@ class VoiceBoard`
`42`	`42`	`static constexpr int kMaxProcessBufferSize = 64;`
`43`	`43`
`44`	`44`	`bool isSilent ();`
`45`		`- void triggerOn ();`
	`45`	`+ void triggerOn (bool reset);`
`46`	`46`	`void triggerOff ();`
`47`	`47`	`void setVelocity (float velocity);`
`48`	`48`