From a8df120a58b3fbafe65225893c89f1078eeb1146 Mon Sep 17 00:00:00 2001
From: Hyunjin Song <tteu.ingog@gmail.com>
Date: Tue, 24 Mar 2020 10:55:46 +0900
Subject: [PATCH] STK Mallets: don't silence active notes when switching
 instruments

This also fixes the underlying noise on instrument switches.
---
 plugins/stk/mallets/mallets.cpp | 16 ++++++++++------
 plugins/stk/mallets/mallets.h   | 11 +++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp
index 29b6aeb20..22880484f 100644
--- a/plugins/stk/mallets/mallets.cpp
+++ b/plugins/stk/mallets/mallets.cpp
@@ -338,6 +338,7 @@ void malletsInstrument::playNote( NotePlayHandle * _n,
 				Engine::mixer()->processingSampleRate() );
 		}
 		m.unlock();
+		static_cast<malletsSynth *>(_n->m_pluginData)->setPresetIndex(p);
 	}
 
 	const fpp_t frames = _n->framesLeftForCurrentPeriod();
@@ -345,6 +346,7 @@ void malletsInstrument::playNote( NotePlayHandle * _n,
 
 	malletsSynth * ps = static_cast<malletsSynth *>( _n->m_pluginData );
 	ps->setFrequency( freq );
+	p = ps->presetIndex();
 
 	sample_t add_scale = 0.0f;
 	if( p == 10 && m_isOldVersionModel.value() == true )
@@ -355,9 +357,9 @@ void malletsInstrument::playNote( NotePlayHandle * _n,
 	for( fpp_t frame = offset; frame < frames + offset; ++frame )
 	{
 		_working_buffer[frame][0] = ps->nextSampleLeft() *
-				( m_scalers[m_presetsModel.value()] + add_scale );
+				( m_scalers[p] + add_scale );
 		_working_buffer[frame][1] = ps->nextSampleRight() *
-				( m_scalers[m_presetsModel.value()] + add_scale );
+				( m_scalers[p] + add_scale );
 	}
 
 	instrumentTrack()->processAudioBuffer( _working_buffer, frames + offset, _n );
@@ -579,7 +581,6 @@ void malletsInstrumentView::modelChanged()
 void malletsInstrumentView::changePreset()
 {
 	malletsInstrument * inst = castModel<malletsInstrument>();
-	inst->instrumentTrack()->silenceAllNotes();
 	int _preset = inst->m_presetsModel.value();
 
 	if( _preset < 9 )
@@ -614,7 +615,8 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 				const StkFloat _control11,
 				const int _control16,
 				const uint8_t _delay,
-				const sample_rate_t _sample_rate )
+				const sample_rate_t _sample_rate ) :
+	m_presetIndex(0)
 {
 	try
 	{
@@ -664,7 +666,8 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 				const StkFloat _control11,
 				const StkFloat _control128,
 				const uint8_t _delay,
-				const sample_rate_t _sample_rate )
+				const sample_rate_t _sample_rate ) :
+	m_presetIndex(0)
 {
 	try
 	{
@@ -712,7 +715,8 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 				const StkFloat _control64,
 				const StkFloat _control128,
 				const uint8_t _delay,
-				const sample_rate_t _sample_rate )
+				const sample_rate_t _sample_rate ) :
+	m_presetIndex(0)
 {
 	try
 	{
diff --git a/plugins/stk/mallets/mallets.h b/plugins/stk/mallets/mallets.h
index 3928c531c..c8f5e7a47 100644
--- a/plugins/stk/mallets/mallets.h
+++ b/plugins/stk/mallets/mallets.h
@@ -120,8 +120,19 @@ public:
 		}
 	}
 
+	inline int presetIndex()
+	{
+		return m_presetIndex;
+	}
+
+	inline void setPresetIndex(int presetIndex)
+	{
+		m_presetIndex = presetIndex;
+	}
+
 
 protected:
+	int m_presetIndex;
 	Instrmnt * m_voice;
 
 	StkFloat * m_delay;