probonopd · probonopd · May 28, 2022 · May 16, 2022 · May 16, 2022 · May 16, 2022
diff --git a/src/minidexed.cpp b/src/minidexed.cpp
@@ -50,7 +50,9 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
 	m_GetChunkTimer ("GetChunk",
 			 1000000U * pConfig->GetChunkSize ()/2 / pConfig->GetSampleRate ()),
 	m_bProfileEnabled (m_pConfig->GetProfileEnabled ()),
-	m_bSavePerformance (false)
+	m_bSavePerformance (false),
+	m_bSavePerformanceNewFile (false),
+	m_bSetNewPerformance (false) 
 {
 	assert (m_pConfig);
 
@@ -185,44 +187,19 @@ bool CMiniDexed::Initialize (void)
 
 	if (m_PerformanceConfig.Load ())
 	{
-		for (unsigned nTG = 0; nTG < CConfig::ToneGenerators; nTG++)
-		{
-			BankSelectLSB (m_PerformanceConfig.GetBankNumber (nTG), nTG);
-			ProgramChange (m_PerformanceConfig.GetVoiceNumber (nTG), nTG);
-			SetMIDIChannel (m_PerformanceConfig.GetMIDIChannel (nTG), nTG);
-			SetVolume (m_PerformanceConfig.GetVolume (nTG), nTG);
-			SetPan (m_PerformanceConfig.GetPan (nTG), nTG);
-			SetMasterTune (m_PerformanceConfig.GetDetune (nTG), nTG);
-			SetCutoff (m_PerformanceConfig.GetCutoff (nTG), nTG);
-			SetResonance (m_PerformanceConfig.GetResonance (nTG), nTG);
-			setPitchbendRange (m_PerformanceConfig.GetPitchBendRange (nTG), nTG);
-			setPitchbendStep (m_PerformanceConfig.GetPitchBendStep (nTG), nTG);
-			setPortamentoMode (m_PerformanceConfig.GetPortamentoMode (nTG), nTG);
-			setPortamentoGlissando (m_PerformanceConfig.GetPortamentoGlissando  (nTG), nTG);
-			setPortamentoTime (m_PerformanceConfig.GetPortamentoTime (nTG), nTG);
-
-			m_nNoteLimitLow[nTG] = m_PerformanceConfig.GetNoteLimitLow (nTG);
-			m_nNoteLimitHigh[nTG] = m_PerformanceConfig.GetNoteLimitHigh (nTG);
-			m_nNoteShift[nTG] = m_PerformanceConfig.GetNoteShift (nTG);
-
-			SetReverbSend (m_PerformanceConfig.GetReverbSend (nTG), nTG);
-		}
-
-		// Effects
-		SetParameter (ParameterCompressorEnable, m_PerformanceConfig.GetCompressorEnable () ? 1 : 0);
-		SetParameter (ParameterReverbEnable, m_PerformanceConfig.GetReverbEnable () ? 1 : 0);
-		SetParameter (ParameterReverbSize, m_PerformanceConfig.GetReverbSize ());
-		SetParameter (ParameterReverbHighDamp, m_PerformanceConfig.GetReverbHighDamp ());
-		SetParameter (ParameterReverbLowDamp, m_PerformanceConfig.GetReverbLowDamp ());
-		SetParameter (ParameterReverbLowPass, m_PerformanceConfig.GetReverbLowPass ());
-		SetParameter (ParameterReverbDiffusion, m_PerformanceConfig.GetReverbDiffusion ());
-		SetParameter (ParameterReverbLevel, m_PerformanceConfig.GetReverbLevel ());
+		LoadPerformanceParameters(); 
 	}
 	else
 	{
 		SetMIDIChannel (CMIDIDevice::OmniMode, 0);
 	}
-
+
+	// load performances file list, and attempt to create the performance folder
+	if (!m_PerformanceConfig.ListPerformances()) 
+	{
+		LOGERR ("Cannot create internal Performance folder, new performances can't be created");
+	}
+
 	// setup and start the sound device
 	if (!m_pSoundDevice->AllocateQueueFrames (m_pConfig->GetChunkSize ()))
 	{
@@ -280,6 +257,18 @@ void CMiniDexed::Process (bool bPlugAndPlayUpdated)
 		m_bSavePerformance = false;
 	}
 
+	if (m_bSavePerformanceNewFile)
+	{
+		DoSavePerformanceNewFile ();
+		m_bSavePerformanceNewFile = false;
+	}
+
+	if (m_bSetNewPerformance)
+	{
+		DoSetNewPerformance ();
+		m_bSetNewPerformance = false;
+	}
+
 	if (m_bProfileEnabled)
 	{
 		m_GetChunkTimer.Dump ();
@@ -985,7 +974,9 @@ bool CMiniDexed::DoSavePerformance (void)
 		m_PerformanceConfig.SetNoteLimitLow (m_nNoteLimitLow[nTG], nTG);
 		m_PerformanceConfig.SetNoteLimitHigh (m_nNoteLimitHigh[nTG], nTG);
 		m_PerformanceConfig.SetNoteShift (m_nNoteShift[nTG], nTG);
-
+		m_pTG[nTG]->getVoiceData(m_nRawVoiceData);  
+ 		m_PerformanceConfig.SetVoiceDataToTxt (m_nRawVoiceData, nTG); 
+
 		m_PerformanceConfig.SetReverbSend (m_nReverbSend[nTG], nTG);
 	}
 
@@ -1226,3 +1217,138 @@ void CMiniDexed::setMasterVolume (float32_t vol)
 	nMasterVolume=vol;
 }
 
+std::string CMiniDexed::GetPerformanceFileName(unsigned nID)
+{
+	return m_PerformanceConfig.GetPerformanceFileName(nID);
+}
+
+std::string CMiniDexed::GetPerformanceName(unsigned nID)
+{
+	return m_PerformanceConfig.GetPerformanceName(nID);
+}
+
+unsigned CMiniDexed::GetLastPerformance()
+{
+	return m_PerformanceConfig.GetLastPerformance();
+}
+
+
+
+unsigned CMiniDexed::GetActualPerformanceID()
+{
+	return m_PerformanceConfig.GetActualPerformanceID();
+}
+
+void CMiniDexed::SetActualPerformanceID(unsigned nID)
+{
+	m_PerformanceConfig.SetActualPerformanceID(nID);
+}
+
+unsigned CMiniDexed::GetMenuSelectedPerformanceID()
+{
+	return m_PerformanceConfig.GetMenuSelectedPerformanceID();
+}
+
+void CMiniDexed::SetMenuSelectedPerformanceID(unsigned nID)
+{
+	m_PerformanceConfig.SetMenuSelectedPerformanceID(nID);
+}
+
+
+bool CMiniDexed::SetNewPerformance(unsigned nID)
+{
+	m_bSetNewPerformance = true;
+	m_nSetNewPerformanceID = nID;
+
+	return true;
+}
+
+bool CMiniDexed::DoSetNewPerformance (void)
+{
+	unsigned nID = m_nSetNewPerformanceID;
+	m_PerformanceConfig.SetNewPerformance(nID);
+
+	if (m_PerformanceConfig.Load ())
+	{
+		LoadPerformanceParameters();
+		return true;
+	}
+	else
+	{
+		SetMIDIChannel (CMIDIDevice::OmniMode, 0);
+		return false;
+	}
+}
+
+bool CMiniDexed::SavePerformanceNewFile ()
+{
+	m_bSavePerformanceNewFile = m_PerformanceConfig.GetInternalFolderOk();
+	return m_bSavePerformanceNewFile;
+}
+
+bool CMiniDexed::DoSavePerformanceNewFile (void)
+{
+	std::string nPerformanceName=""; // for future enhacements: capability to write performance name
+	if (m_PerformanceConfig.CreateNewPerformanceFile(nPerformanceName))
+	{
+		if(SavePerformance())
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		return false;
+	}
+
+}
+
+
+void CMiniDexed::LoadPerformanceParameters(void)
+{
+	for (unsigned nTG = 0; nTG < CConfig::ToneGenerators; nTG++)
+		{
+
+			BankSelectLSB (m_PerformanceConfig.GetBankNumber (nTG), nTG);
+			ProgramChange (m_PerformanceConfig.GetVoiceNumber (nTG), nTG);
+			SetMIDIChannel (m_PerformanceConfig.GetMIDIChannel (nTG), nTG);
+			SetVolume (m_PerformanceConfig.GetVolume (nTG), nTG);
+			SetPan (m_PerformanceConfig.GetPan (nTG), nTG);
+			SetMasterTune (m_PerformanceConfig.GetDetune (nTG), nTG);
+			SetCutoff (m_PerformanceConfig.GetCutoff (nTG), nTG);
+			SetResonance (m_PerformanceConfig.GetResonance (nTG), nTG);
+			setPitchbendRange (m_PerformanceConfig.GetPitchBendRange (nTG), nTG);
+			setPitchbendStep (m_PerformanceConfig.GetPitchBendStep (nTG), nTG);
+			setPortamentoMode (m_PerformanceConfig.GetPortamentoMode (nTG), nTG);
+			setPortamentoGlissando (m_PerformanceConfig.GetPortamentoGlissando  (nTG), nTG);
+			setPortamentoTime (m_PerformanceConfig.GetPortamentoTime (nTG), nTG);
+
+			m_nNoteLimitLow[nTG] = m_PerformanceConfig.GetNoteLimitLow (nTG);
+			m_nNoteLimitHigh[nTG] = m_PerformanceConfig.GetNoteLimitHigh (nTG);
+			m_nNoteShift[nTG] = m_PerformanceConfig.GetNoteShift (nTG);
+
+			if(m_PerformanceConfig.VoiceDataFilled(nTG)) 
+			{
+			uint8_t* tVoiceData = m_PerformanceConfig.GetVoiceDataFromTxt(nTG);
+			m_pTG[nTG]->loadVoiceParameters(tVoiceData); 
+			}
+
+			SetReverbSend (m_PerformanceConfig.GetReverbSend (nTG), nTG);
+
+		}
+
+		// Effects
+		SetParameter (ParameterCompressorEnable, m_PerformanceConfig.GetCompressorEnable () ? 1 : 0);
+		SetParameter (ParameterReverbEnable, m_PerformanceConfig.GetReverbEnable () ? 1 : 0);
+		SetParameter (ParameterReverbSize, m_PerformanceConfig.GetReverbSize ());
+		SetParameter (ParameterReverbHighDamp, m_PerformanceConfig.GetReverbHighDamp ());
+		SetParameter (ParameterReverbLowDamp, m_PerformanceConfig.GetReverbLowDamp ());
+		SetParameter (ParameterReverbLowPass, m_PerformanceConfig.GetReverbLowPass ());
+		SetParameter (ParameterReverbDiffusion, m_PerformanceConfig.GetReverbDiffusion ());
+		SetParameter (ParameterReverbLevel, m_PerformanceConfig.GetReverbLevel ());
+}
+
diff --git a/src/minidexed.h b/src/minidexed.h
@@ -104,6 +104,19 @@ class CMiniDexed
 
 	int16_t checkSystemExclusive(const uint8_t* pMessage, const uint16_t nLength, uint8_t nTG);
 
+	std::string GetPerformanceFileName(unsigned nID);
+	std::string GetPerformanceName(unsigned nID);
+	unsigned GetLastPerformance();
+	unsigned GetActualPerformanceID();
+	void SetActualPerformanceID(unsigned nID);
+	bool SetNewPerformance(unsigned nID);
+	bool SavePerformanceNewFile ();
+	unsigned GetMenuSelectedPerformanceID();
+	void SetMenuSelectedPerformanceID(unsigned nID);
+
+	bool DoSavePerformanceNewFile (void);
+	bool DoSetNewPerformance (void);
+
 	enum TParameter
 	{
 		ParameterCompressorEnable,
@@ -157,7 +170,7 @@ class CMiniDexed
 private:
 	int16_t ApplyNoteLimits (int16_t pitch, unsigned nTG);	// returns < 0 to ignore note
 	uint8_t m_uchOPMask[CConfig::ToneGenerators];
-
+	void LoadPerformanceParameters(void); 
 	void ProcessSound (void);
 
 #ifdef ARM_ALLOW_MULTI_CORE
@@ -197,9 +210,18 @@ class CMiniDexed
 	int m_nNoteShift[CConfig::ToneGenerators];
 
 	unsigned m_nReverbSend[CConfig::ToneGenerators];
-
+
+	uint8_t m_nRawVoiceData[156]; 
+
+
+	bool m_bSavePerformanceNewFile;
+	bool m_bSetNewPerformance;
+	unsigned m_nSetNewPerformanceID;
+
 	float32_t nMasterVolume;
 
+
+
 	CUserInterface m_UI;
 	CSysExFileLoader m_SysExFileLoader;
 	CPerformanceConfig m_PerformanceConfig;

diff --git a/src/performance.ini b/src/performance.ini
@@ -20,6 +20,7 @@
 #PortamentoMode#=0 # 0 .. 1
 #PortamentoGlissando#=0 # 0 .. 1
 #PortamentoTime#=0 # 0 .. 99
+#VoiceData#= # space separated hex numbers of 156 voice parameters. Example: 5F 1D 14 32 63 [....] 20 55 
 
 # TG1
 BankNumber1=0
@@ -39,6 +40,7 @@ PitchBendStep1=0
 PortamentoMode1=0
 PortamentoGlissando1=0
 PortamentoTime1=0
+VoiceData1=
 
 # TG2
 BankNumber2=0
@@ -58,6 +60,7 @@ PitchBendStep2=0
 PortamentoMode2=0
 PortamentoGlissando2=0
 PortamentoTime2=0
+VoiceData2=
 
 # TG3
 BankNumber3=0
@@ -77,6 +80,7 @@ PitchBendStep3=0
 PortamentoMode3=0
 PortamentoGlissando3=0
 PortamentoTime3=0
+VoiceData3=
 
 # TG4
 BankNumber4=0
@@ -96,6 +100,7 @@ PitchBendStep4=0
 PortamentoMode4=0
 PortamentoGlissando4=0
 PortamentoTime4=0
+VoiceData4=
 
 # TG5
 BankNumber5=0
@@ -115,6 +120,7 @@ PitchBendStep5=0
 PortamentoMode5=0
 PortamentoGlissando5=0
 PortamentoTime5=0
+VoiceData5=
 
 # TG6
 BankNumber6=0
@@ -134,6 +140,7 @@ PitchBendStep6=0
 PortamentoMode6=0
 PortamentoGlissando6=0
 PortamentoTime6=0
+VoiceData6=
 
 # TG7
 BankNumber7=0
@@ -153,6 +160,7 @@ PitchBendStep7=0
 PortamentoMode7=0
 PortamentoGlissando7=0
 PortamentoTime7=0
+VoiceData7=
 
 # TG8
 BankNumber8=0
@@ -172,6 +180,7 @@ PitchBendStep8=0
 PortamentoMode8=0
 PortamentoGlissando8=0
 PortamentoTime8=0
+VoiceData8=
 
 # Effects
 #CompressorEnable=1	# 0: off, 1: on