From be06ff0a282a3ae72f95fee2ece24b314cbfb20d Mon Sep 17 00:00:00 2001
From: donluca <51792528+donluca@users.noreply.github.com>
Date: Tue, 28 Feb 2023 15:11:45 +0000
Subject: [PATCH] Changed the way we parse and set the engine type from the
 config file following @diyelectromusic suggestions

---
 src/config.cpp    | 13 +++++++++++--
 src/config.h      |  4 ++--
 src/minidexed.cpp |  1 +
 src/minidexed.ini |  4 ++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index d211126..5b8834c 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -21,6 +21,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 #include "config.h"
+#include "../Synth_Dexed/src/dexed.h"
 
 CConfig::CConfig (FATFS *pFileSystem)
 :	m_Properties ("minidexed.ini", pFileSystem)
@@ -122,7 +123,15 @@ void CConfig::Load (void)
 	m_bMIDIDumpEnabled  = m_Properties.GetNumber ("MIDIDumpEnabled", 0) != 0;
 	m_bProfileEnabled = m_Properties.GetNumber ("ProfileEnabled", 0) != 0;
 	m_bPerformanceSelectToLoad = m_Properties.GetNumber ("PerformanceSelectToLoad", 1) != 0;
-	m_EngineType = (unsigned char)*m_Properties.GetString ("EngineType", "MSFA");
+	
+	unsigned newEngineType = m_Properties.GetNumber ("EngineType", 1);
+	if (newEngineType == 2) {
+  		m_EngineType = MKI;
+	} else if (newEngineType = 3) {
+  		m_EngineType = OPL;
+	} else {
+  		m_EngineType = MSFA;
+	}
 }
 
 const char *CConfig::GetSoundDevice (void) const
@@ -390,7 +399,7 @@ bool CConfig::GetPerformanceSelectToLoad (void) const
 	return m_bPerformanceSelectToLoad;
 }
 
-uint8_t CConfig::GetEngineType (void) const
+unsigned CConfig::GetEngineType (void) const
 {
 	return m_EngineType;
 }
diff --git a/src/config.h b/src/config.h
index 9e27fb9..1e3ae25 100644
--- a/src/config.h
+++ b/src/config.h
@@ -141,7 +141,7 @@ public:
 	
 	// Load performance mode. 0 for load just rotating encoder, 1 load just when Select is pushed
 	bool GetPerformanceSelectToLoad (void) const;
-	uint8_t GetEngineType (void) const;
+	unsigned GetEngineType (void) const;
 
 
 private:
@@ -210,7 +210,7 @@ private:
 	bool m_bMIDIDumpEnabled;
 	bool m_bProfileEnabled;
 	bool m_bPerformanceSelectToLoad;
-	uint8_t m_EngineType;
+	unsigned m_EngineType;
 
 };
 
diff --git a/src/minidexed.cpp b/src/minidexed.cpp
index caf2fc1..dbd32f7 100644
--- a/src/minidexed.cpp
+++ b/src/minidexed.cpp
@@ -92,6 +92,7 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
 
 		m_pTG[i] = new CDexedAdapter (CConfig::MaxNotes, pConfig->GetSampleRate ());
 		assert (m_pTG[i]);
+		
 		m_pTG[i]->setEngineType(pConfig->GetEngineType ());
 		m_pTG[i]->activate ();
 	}
diff --git a/src/minidexed.ini b/src/minidexed.ini
index ad578cf..5e30ac9 100644
--- a/src/minidexed.ini
+++ b/src/minidexed.ini
@@ -88,5 +88,5 @@ ProfileEnabled=0
 # Performance
 PerformanceSelectToLoad=1
 
-# Engine Type
-EngineType=MSFA
+# Engine Type ( 1=Modern ; 2=Mark I ; 3=OPL )
+EngineType=1