From 09af1e3b9a1f18330bd30d71d25c0549e681d554 Mon Sep 17 00:00:00 2001
From: donluca <51792528+donluca@users.noreply.github.com>
Date: Fri, 3 Mar 2023 15:37:42 +0000
Subject: [PATCH] Moved blocks of code around

---
 src/config.cpp    | 28 +++++++++++++++-------------
 src/config.h      |  6 +++---
 src/minidexed.ini |  5 ++---
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index 3da1c96..5065d01 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -47,6 +47,15 @@ void CConfig::Load (void)
 	m_nDACI2CAddress = m_Properties.GetNumber ("DACI2CAddress", 0);
 	m_bChannelsSwapped = m_Properties.GetNumber ("ChannelsSwapped", 0) != 0;
 
+		unsigned newEngineType = m_Properties.GetNumber ("EngineType", 1);
+	if (newEngineType == 2) {
+  		m_EngineType = MKI;
+	} else if (newEngineType == 3) {
+  		m_EngineType = OPL;
+	} else {
+  		m_EngineType = MSFA;
+	}
+
 	m_nMIDIBaudRate = m_Properties.GetNumber ("MIDIBaudRate", 31250);
 
 	const char *pMIDIThru = m_Properties.GetString ("MIDIThru");
@@ -123,15 +132,6 @@ 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;
-	
-	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
@@ -159,6 +159,11 @@ bool CConfig::GetChannelsSwapped (void) const
 	return m_bChannelsSwapped;
 }
 
+unsigned CConfig::GetEngineType (void) const
+{
+	return m_EngineType;
+}
+
 unsigned CConfig::GetMIDIBaudRate (void) const
 {
 	return m_nMIDIBaudRate;
@@ -399,7 +404,4 @@ bool CConfig::GetPerformanceSelectToLoad (void) const
 	return m_bPerformanceSelectToLoad;
 }
 
-unsigned CConfig::GetEngineType (void) const
-{
-	return m_EngineType;
-}
+
diff --git a/src/config.h b/src/config.h
index 1e3ae25..09c0529 100644
--- a/src/config.h
+++ b/src/config.h
@@ -69,6 +69,7 @@ public:
 	unsigned GetChunkSize (void) const;
 	unsigned GetDACI2CAddress (void) const;		// 0 for auto probing
 	bool GetChannelsSwapped (void) const;
+	unsigned GetEngineType (void) const;
 
 	// MIDI
 	unsigned GetMIDIBaudRate (void) const;
@@ -141,8 +142,6 @@ public:
 	
 	// Load performance mode. 0 for load just rotating encoder, 1 load just when Select is pushed
 	bool GetPerformanceSelectToLoad (void) const;
-	unsigned GetEngineType (void) const;
-
 
 private:
 	CPropertiesFatFsFile m_Properties;
@@ -152,6 +151,7 @@ private:
 	unsigned m_nChunkSize;
 	unsigned m_nDACI2CAddress;
 	bool m_bChannelsSwapped;
+	unsigned m_EngineType;
 
 	unsigned m_nMIDIBaudRate;
 	std::string m_MIDIThruIn;
@@ -210,7 +210,7 @@ private:
 	bool m_bMIDIDumpEnabled;
 	bool m_bProfileEnabled;
 	bool m_bPerformanceSelectToLoad;
-	unsigned m_EngineType;
+
 
 };
 
diff --git a/src/minidexed.ini b/src/minidexed.ini
index 5e30ac9..2190277 100644
--- a/src/minidexed.ini
+++ b/src/minidexed.ini
@@ -10,6 +10,8 @@ SampleRate=48000
 #ChunkSize=256
 DACI2CAddress=0
 ChannelsSwapped=0
+# Engine Type ( 1=Modern ; 2=Mark I ; 3=OPL )
+EngineType=1
 
 # MIDI
 MIDIBaudRate=31250
@@ -87,6 +89,3 @@ ProfileEnabled=0
 
 # Performance
 PerformanceSelectToLoad=1
-
-# Engine Type ( 1=Modern ; 2=Mark I ; 3=OPL )
-EngineType=1