Added Send FX 1 to performance load and save

src/minidexed.cpp

@@ -1531,8 +1531,6 @@ void CMiniDexed::ProcessSound (void)
 		// BEGIN adding send fx 1
 		float32_t SendFXOutputBuffer[2][nFrames];
 		float32_t SendFXMixBuffer[2][nFrames];
-		arm_fill_f32(0.0f, SendFXOutputBuffer[indexL], nFrames);
-		arm_fill_f32(0.0f, SendFXOutputBuffer[indexR], nFrames);
 		arm_fill_f32(0.0f, SendFXMixBuffer[indexR], nFrames);
 		arm_fill_f32(0.0f, SendFXMixBuffer[indexL], nFrames);
 		
@@ -1542,14 +1540,12 @@ void CMiniDexed::ProcessSound (void)
 		m_SendFX1SpinLock.Release ();
 		
 		// send to FX 2
-		arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX1SendFXLevel, SendFXMixBuffer[indexL], nFrames);
-		arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX1SendFXLevel, SendFXMixBuffer[indexR], nFrames);
 		send_fx2_mixer->doAddMix(CConfig::SendFX2MixerChannels - 1, SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
 
-		// scale down and add left reverb buffer by reverb level 
+		// scale down and add left send fx buffer by send fx level 
 		arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX1Level, SendFXOutputBuffer[indexL], nFrames);
 		arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames);
-		// scale down and add right reverb buffer by reverb level 
+		// scale down and add right send fx buffer by send fx level 
 		arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX1Level, SendFXOutputBuffer[indexR], nFrames);
 		arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames);
 		// END adding send fx 1
@@ -1561,10 +1557,10 @@ void CMiniDexed::ProcessSound (void)
 		m_SendFX2->process(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR], SendFXOutputBuffer[indexL], SendFXOutputBuffer[indexR], nFrames);
 		m_SendFX2SpinLock.Release ();
 
-		// scale down and add left reverb buffer by reverb level 
+		// scale down and add left send fx buffer by send fx level 
 		arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX2Level, SendFXOutputBuffer[indexL], nFrames);
 		arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames);
-		// scale down and add right reverb buffer by reverb level 
+		// scale down and add right send fx buffer by send fx level 
 		arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX2Level, SendFXOutputBuffer[indexR], nFrames);
 		arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames);
 		// END adding send fx 2
@@ -1903,23 +1899,32 @@ bool CMiniDexed::DoSavePerformance (void)
 		m_PerformanceConfig.SetAftertouchRange (m_nAftertouchRange[nTG], nTG);
 		m_PerformanceConfig.SetAftertouchTarget (m_nAftertouchTarget[nTG], nTG);
 		
+		m_PerformanceConfig.SetSendFX1Send (m_nSendFX1[nTG], nTG);
 		m_PerformanceConfig.SetReverbSend (m_nSendFX2[nTG], nTG);
 	}
 
 	m_PerformanceConfig.SetCompressorEnable (!!m_nParameter[ParameterCompressorEnable]);
 
+	m_PerformanceConfig.SetSendFX1 (m_SendFX1->getId());
+	std::vector<unsigned> pParamsSendFX1 = m_SendFX1->getParameters();
+	m_PerformanceConfig.SetSendFX1Params (pParamsSendFX1);
+	pParamsSendFX1.clear();
+	pParamsSendFX1.shrink_to_fit();
+	m_PerformanceConfig.SetSendFX1Level (roundf(m_SendFX1Level * 100));
+	m_PerformanceConfig.SetSendFX1SendLevel (roundf(m_SendFX1SendFXLevel * 100));
+
 	m_PerformanceConfig.SetSendFX2 (m_SendFX2->getId());
-	std::vector<unsigned> pParams = m_SendFX2->getParameters();
+	std::vector<unsigned> pParamsSendFX2 = m_SendFX2->getParameters();
-	m_PerformanceConfig.SetSendFX2Params (pParams);
+	m_PerformanceConfig.SetSendFX2Params (pParamsSendFX2);
-	pParams.clear();
+	pParamsSendFX2.clear();
-	pParams.shrink_to_fit();
+	pParamsSendFX2.shrink_to_fit();
 	m_PerformanceConfig.SetSendFX2Level (roundf(m_SendFX2Level * 100));
 
 	m_PerformanceConfig.SetMasterFX (m_MasterFX->getId());
-	std::vector<unsigned> pMasterParams = m_MasterFX->getParameters();
+	std::vector<unsigned> pParamsMaster = m_MasterFX->getParameters();
-	m_PerformanceConfig.SetMasterFXParams (pMasterParams);
+	m_PerformanceConfig.SetMasterFXParams (pParamsMaster);
-	pMasterParams.clear();
+	pParamsMaster.clear();
-	pMasterParams.shrink_to_fit();
+	pParamsMaster.shrink_to_fit();
 
 	m_PerformanceConfig.SetTempo (m_nTempo);
 
@@ -2392,6 +2397,7 @@ void CMiniDexed::LoadPerformanceParameters(void)
 			m_pTG[nTG]->loadVoiceParameters(tVoiceData); 
 			}
 			setMonoMode(m_PerformanceConfig.GetMonoMode(nTG) ? 1 : 0, nTG); 
+			SetSendFX1 (m_PerformanceConfig.GetSendFX1Send (nTG), nTG);
 			SetReverbSend (m_PerformanceConfig.GetReverbSend (nTG), nTG);
 					
 			setModWheelRange (m_PerformanceConfig.GetModulationWheelRange (nTG),  nTG);
@@ -2409,18 +2415,26 @@ void CMiniDexed::LoadPerformanceParameters(void)
 		// Effects
 		SetParameter (ParameterCompressorEnable, m_PerformanceConfig.GetCompressorEnable () ? 1 : 0);
 
+		setSendFX1Type(m_PerformanceConfig.GetSendFX1 ());
+		std::vector<unsigned> pParamsFX1 = m_PerformanceConfig.GetSendFX1Params ();
+		m_SendFX1->setParameters(pParamsFX1);
+		pParamsFX1.clear();
+		pParamsFX1.shrink_to_fit();
+		SetParameter (ParameterSendFX1Level, m_PerformanceConfig.GetSendFX1Level ());
+		SetParameter (ParameterSendFX1SendFXLevel, m_PerformanceConfig.GetSendFX1SendLevel ());
+
 		setSendFX2Type(m_PerformanceConfig.GetSendFX2 ());
-		std::vector<unsigned> pParams = m_PerformanceConfig.GetSendFX2Params ();
+		std::vector<unsigned> pParamsFX2 = m_PerformanceConfig.GetSendFX2Params ();
-		m_SendFX2->setParameters(pParams);
+		m_SendFX2->setParameters(pParamsFX2);
-		pParams.clear();
+		pParamsFX2.clear();
-		pParams.shrink_to_fit();
+		pParamsFX2.shrink_to_fit();
 		SetParameter (ParameterSendFX2Level, m_PerformanceConfig.GetSendFX2Level ());
 
 		setMasterFXType(m_PerformanceConfig.GetMasterFX ());
-		std::vector<unsigned> pMasterParams = m_PerformanceConfig.GetMasterFXParams ();
+		std::vector<unsigned> pParamsMaster = m_PerformanceConfig.GetMasterFXParams ();
-		m_MasterFX->setParameters(pMasterParams);
+		m_MasterFX->setParameters(pParamsMaster);
-		pMasterParams.clear();
+		pParamsMaster.clear();
-		pMasterParams.shrink_to_fit();
+		pParamsMaster.shrink_to_fit();
 
 		SetParameter (ParameterTempo, m_PerformanceConfig.GetTempo ());
 }

src/performanceconfig.cpp

@@ -175,6 +175,9 @@ bool CPerformanceConfig::Load (void)
 		PropertyName.Format ("NoteShift%u", nTG+1);
 		m_nNoteShift[nTG] = m_Properties.GetSignedNumber (PropertyName, 0);
 
+		PropertyName.Format ("SendFX1%u", nTG+1);
+		m_nSendFX1Send[nTG] = m_Properties.GetNumber (PropertyName, 0);
+
 		PropertyName.Format ("ReverbSend%u", nTG+1);
 		m_nReverbSend[nTG] = m_Properties.GetNumber (PropertyName, 50);
 		
@@ -237,7 +240,7 @@ bool CPerformanceConfig::Load (void)
 
 	m_nTempo = m_Properties.GetNumber ("Tempo", 120);
 
-	m_nSendFX1 = m_Properties.GetNumber ("SendFX1", 7);
+	m_nSendFX1 = m_Properties.GetNumber ("SendFX1", 2);
 	m_sSendFX1Params = m_Properties.GetString ("SendFX1Params", "");
 	m_nSendFX1SendLevel = m_Properties.GetNumber ("SendFX1SendLevel", 0);
 	m_nSendFX1Level = m_Properties.GetNumber ("SendFX1Level", 100);
@@ -332,6 +335,9 @@ bool CPerformanceConfig::Save (void)
 		PropertyName.Format ("NoteShift%u", nTG+1);
 		m_Properties.SetSignedNumber (PropertyName, m_nNoteShift[nTG]);
 
+		PropertyName.Format ("SendFX1%u", nTG+1);
+		m_Properties.SetNumber (PropertyName, m_nSendFX1Send[nTG]);
+
 		PropertyName.Format ("ReverbSend%u", nTG+1);
 		m_Properties.SetNumber (PropertyName, m_nReverbSend[nTG]);
 		
@@ -538,6 +544,12 @@ int CPerformanceConfig::GetNoteShift (unsigned nTG) const
 	return m_nNoteShift[nTG];
 }
 
+unsigned CPerformanceConfig::GetSendFX1Send (unsigned nTG) const
+{
+	assert (nTG < CConfig::AllToneGenerators);
+	return m_nSendFX1Send[nTG];
+}
+
 unsigned CPerformanceConfig::GetReverbSend (unsigned nTG) const
 {
 	assert (nTG < CConfig::AllToneGenerators);
@@ -634,6 +646,12 @@ void CPerformanceConfig::SetNoteShift (int nValue, unsigned nTG)
 	m_nNoteShift[nTG] = nValue;
 }
 
+void CPerformanceConfig::SetSendFX1Send (unsigned nValue, unsigned nTG)
+{
+	assert (nTG < CConfig::AllToneGenerators);
+	m_nSendFX1Send[nTG] = nValue;
+}
+
 void CPerformanceConfig::SetReverbSend (unsigned nValue, unsigned nTG)
 {
 	assert (nTG < CConfig::AllToneGenerators);
@@ -742,7 +760,7 @@ void CPerformanceConfig::SetSendFX1 (unsigned nValue)
 
 void CPerformanceConfig::SetSendFX2 (unsigned nValue)
 {
-	m_nSendFX1 = nValue;
+	m_nSendFX2 = nValue;
 }
 
 void CPerformanceConfig::SetSendFX1Params (std::vector<unsigned> pParams)

src/performanceconfig.h

@@ -59,6 +59,7 @@ public:
 	unsigned GetNoteLimitLow (unsigned nTG) const;		// 0 .. 127
 	unsigned GetNoteLimitHigh (unsigned nTG) const;		// 0 .. 127
 	int GetNoteShift (unsigned nTG) const;			// -24 .. 24
+	unsigned GetSendFX1Send (unsigned nTG) const;		// 0 .. 127
 	unsigned GetReverbSend (unsigned nTG) const;		// 0 .. 127
 	unsigned GetPitchBendRange (unsigned nTG) const;		// 0 .. 12
 	unsigned GetPitchBendStep (unsigned nTG) const;		// 0 .. 12
@@ -91,6 +92,7 @@ public:
 	void SetNoteLimitLow (unsigned nValue, unsigned nTG);
 	void SetNoteLimitHigh (unsigned nValue, unsigned nTG);
 	void SetNoteShift (int nValue, unsigned nTG);
+	void SetSendFX1Send (unsigned nValue, unsigned nTG);
 	void SetReverbSend (unsigned nValue, unsigned nTG);
 	void SetPitchBendRange (unsigned nValue, unsigned nTG);
 	void SetPitchBendStep (unsigned nValue, unsigned nTG);
@@ -198,6 +200,7 @@ private:
 	unsigned m_nNoteLimitLow[CConfig::AllToneGenerators];
 	unsigned m_nNoteLimitHigh[CConfig::AllToneGenerators];
 	int m_nNoteShift[CConfig::AllToneGenerators];
+	int m_nSendFX1Send[CConfig::AllToneGenerators];
 	int m_nReverbSend[CConfig::AllToneGenerators];
 	unsigned m_nPitchBendRange[CConfig::AllToneGenerators];
 	unsigned m_nPitchBendStep[CConfig::AllToneGenerators];