From dabe431d53469d36172611375998c702f99967e6 Mon Sep 17 00:00:00 2001 From: abscisys Date: Tue, 20 Dec 2022 01:13:46 +0100 Subject: [PATCH] Fixing compiling errors on RPI1 --- src/minidexed.cpp | 12 +++++++----- src/performanceconfig.cpp | 9 ++++++++- src/performanceconfig.h | 5 ++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/minidexed.cpp b/src/minidexed.cpp index 830e63d..46d951e 100644 --- a/src/minidexed.cpp +++ b/src/minidexed.cpp @@ -37,9 +37,6 @@ 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), @@ -54,6 +51,9 @@ 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,11 +159,13 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt, SetParameter (ParameterCompressorEnable, 1); - // BEGIN Unison + #ifdef ARM_ALLOW_MULTI_CORE + /* Unison START */ SetParameter (ParameterUnisonEnable, 0); SetParameter (ParameterUnisonPanSpread, 60); SetParameter (ParameterUnisonDetuneSpread, 12); - // END Unison + /* Unison END */ + #endif }; bool CMiniDexed::Initialize (void) diff --git a/src/performanceconfig.cpp b/src/performanceconfig.cpp index 545a8eb..af36e8a 100644 --- a/src/performanceconfig.cpp +++ b/src/performanceconfig.cpp @@ -159,10 +159,13 @@ bool CPerformanceConfig::Load (void) m_nReverbDiffusion = m_Properties.GetNumber ("ReverbDiffusion", 65); m_nReverbLevel = m_Properties.GetNumber ("ReverbLevel", 99); - // Unison + #ifdef ARM_ALLOW_MULTI_CORE + /* 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; } @@ -282,9 +285,13 @@ 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 (); } diff --git a/src/performanceconfig.h b/src/performanceconfig.h index 3b3838f..017c419 100644 --- a/src/performanceconfig.h +++ b/src/performanceconfig.h @@ -192,10 +192,13 @@ private: unsigned m_nReverbDiffusion; unsigned m_nReverbLevel; - // Unison + #ifdef ARM_ALLOW_MULTI_CORE + /* Unison START */ bool m_bUnisonEnable; unsigned m_nUnisonPanSpread; unsigned m_nUnisonDetuneSpread; + /* Unison END */ + #endif }; #endif