Revert "Fixing compiling errors on RPI1"

This reverts commit dabe431d53.

src/minidexed.cpp

@@ -37,6 +37,9 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
 	CMultiCoreSupport (CMemorySystem::Get ()),
 #endif
 	m_pConfig (pConfig),
+	m_bSavePerformanceNewFile (false),
+	m_bSetNewPerformance (false),
+	m_bDeletePerformance (false),
 	m_UI (this, pGPIOManager, pI2CMaster, pConfig),
 	m_PerformanceConfig (pFileSystem),
 	m_PCKeyboard (this, pConfig, &m_UI),
@@ -51,9 +54,6 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
 			 1000000U * pConfig->GetChunkSize ()/2 / pConfig->GetSampleRate ()),
 	m_bProfileEnabled (m_pConfig->GetProfileEnabled ()),
 	m_bSavePerformance (false),
-	m_bSavePerformanceNewFile (false),
-	m_bSetNewPerformance (false),
-	m_bDeletePerformance (false),
 	m_bLoadPerformanceBusy(false),
 	m_bSaveAsDefault(false)
 {
@@ -159,13 +159,11 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
 
 	SetParameter (ParameterCompressorEnable, 1);
 
-	#ifdef ARM_ALLOW_MULTI_CORE
+	// BEGIN Unison
-	/* Unison START */
 	SetParameter (ParameterUnisonEnable, 0);
 	SetParameter (ParameterUnisonPanSpread, 60);
 	SetParameter (ParameterUnisonDetuneSpread, 12);
-	/* Unison END */
+	// END Unison
-	#endif
 };
 
 bool CMiniDexed::Initialize (void)

src/performanceconfig.cpp

@@ -159,13 +159,10 @@ bool CPerformanceConfig::Load (void)
 	m_nReverbDiffusion = m_Properties.GetNumber ("ReverbDiffusion", 65);
 	m_nReverbLevel = m_Properties.GetNumber ("ReverbLevel", 99);
 
-	#ifdef ARM_ALLOW_MULTI_CORE
+	// Unison
-	/* Unison START */
 	m_bUnisonEnable = m_Properties.GetNumber("UnisonEnable", 0) != 0;
 	m_nUnisonPanSpread = m_Properties.GetNumber("UnisonPanSpread", 56);
 	m_nUnisonDetuneSpread = m_Properties.GetNumber("UnisonDetuneSpread", 21);
-	/* Unison END */
-	#endif
 
 	return bResult;
 }
@@ -285,13 +282,9 @@ bool CPerformanceConfig::Save (void)
 	m_Properties.SetNumber ("ReverbDiffusion", m_nReverbDiffusion);
 	m_Properties.SetNumber ("ReverbLevel", m_nReverbLevel);
 
-	#ifdef ARM_ALLOW_MULTI_CORE
-	/* Unison START */
 	m_Properties.SetNumber ("UnisonEnable", m_bUnisonEnable ? 1 : 0);
 	m_Properties.SetNumber ("UnisonPanSpread", m_nUnisonPanSpread);
 	m_Properties.SetNumber ("UnisonDetuneSpread", m_nUnisonDetuneSpread);
-	/* Unison END */
-	#endif
 
 	return m_Properties.Save ();
 }

src/performanceconfig.h

@@ -192,13 +192,10 @@ private:
 	unsigned m_nReverbDiffusion;
 	unsigned m_nReverbLevel;
 
-	#ifdef ARM_ALLOW_MULTI_CORE
+	// Unison
-	/* Unison START */
 	bool m_bUnisonEnable;
 	unsigned m_nUnisonPanSpread;
 	unsigned m_nUnisonDetuneSpread;
-	/* Unison END */
-	#endif
 };
 
 #endif