From 47de8fb92fedfa85b8f6edeaf51fa60f1dad69ad Mon Sep 17 00:00:00 2001 From: Javier Nonis Date: Thu, 26 Dec 2024 19:26:30 -0300 Subject: [PATCH] Updated FX branch for lastest changes --- src/minidexed.cpp | 22 +++++++++++----------- src/performanceconfig.cpp | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/minidexed.cpp b/src/minidexed.cpp index 7089417..2807adf 100644 --- a/src/minidexed.cpp +++ b/src/minidexed.cpp @@ -694,7 +694,7 @@ void CMiniDexed::SetPan (unsigned nPan, unsigned nTG) void CMiniDexed::setInsertFXType (unsigned nType, unsigned nTG) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); // If the effect type is already set just return if (m_InsertFX[nTG]->getId() == nType) { @@ -712,13 +712,13 @@ void CMiniDexed::setInsertFXType (unsigned nType, unsigned nTG) std::string CMiniDexed::getInsertFXName (unsigned nTG) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); return m_InsertFX[nTG]->getName(); } void CMiniDexed::setMidiFXType (unsigned nType, unsigned nTG) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); // If the effect type is already set just return if (m_MidiArp[nTG]->getId() == nType) { @@ -736,7 +736,7 @@ void CMiniDexed::setMidiFXType (unsigned nType, unsigned nTG) std::string CMiniDexed::getMidiFXName (unsigned nTG) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); return m_MidiArp[nTG]->getName(); } @@ -880,7 +880,7 @@ void CMiniDexed::setTempo(unsigned nValue) // Set Tempo to FXs m_SendFX->setTempo(m_nTempo); - for (unsigned nTG = 0; nTG < CConfig::ToneGenerators; nTG++) + for (unsigned nTG = 0; nTG < CConfig::AllToneGenerators; nTG++) { m_InsertFX[nTG]->setTempo(m_nTempo); m_MidiArp[nTG]->setTempo(m_nTempo); @@ -1300,28 +1300,28 @@ int CMiniDexed::GetTGParameter (TTGParameter Parameter, unsigned nTG) } void CMiniDexed::SetMidiFXParameter (unsigned Parameter, int nValue, unsigned nTG, unsigned nFXType) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); assert (m_MidiArp[nTG]->getId() == nFXType); m_MidiArp[nTG]->setParameter(Parameter, nValue); } int CMiniDexed::GetMidiFXParameter (unsigned Parameter, unsigned nTG, unsigned nFXType) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); assert (m_MidiArp[nTG]->getId() == nFXType); return m_MidiArp[nTG]->getParameter(Parameter); } void CMiniDexed::SetTGFXParameter (unsigned Parameter, int nValue, unsigned nTG, unsigned nFXType) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); assert (m_InsertFX[nTG]->getId() == nFXType); m_InsertFX[nTG]->setParameter(Parameter, nValue); } int CMiniDexed::GetTGFXParameter (unsigned Parameter, unsigned nTG, unsigned nFXType) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); assert (m_InsertFX[nTG]->getId() == nFXType); return m_InsertFX[nTG]->getParameter(Parameter); @@ -1523,11 +1523,11 @@ void CMiniDexed::ProcessSound (void) { if(nMasterVolume >0.0 && nMasterVolume <1.0) { - tmp_float[(i*Channels)+tg]=m_OutputLevel[tg][i] * nMasterVolume; + tmp_float[(i*Channels)+tg]=m_OutputLevel[tg][0][i] * nMasterVolume; } else if(nMasterVolume == 1.0) { - tmp_float[(i*Channels)+tg]=m_OutputLevel[tg][i]; + tmp_float[(i*Channels)+tg]=m_OutputLevel[tg][0][i]; } } } diff --git a/src/performanceconfig.cpp b/src/performanceconfig.cpp index 318e504..192b40c 100644 --- a/src/performanceconfig.cpp +++ b/src/performanceconfig.cpp @@ -458,25 +458,25 @@ unsigned CPerformanceConfig::GetPan (unsigned nTG) const unsigned CPerformanceConfig::GetInsertFX (unsigned nTG) const { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); return m_nInsertFX[nTG]; } std::vector CPerformanceConfig::GetInsertFXParams (unsigned nTG) const { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); return StringToVector(m_sInsertFXParams[nTG]); } unsigned CPerformanceConfig::GetMidiFX (unsigned nTG) const { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); return m_nMidiFX[nTG]; } std::vector CPerformanceConfig::GetMidiFXParams (unsigned nTG) const { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); return StringToVector(m_sMidiFXParams[nTG]); } @@ -554,25 +554,25 @@ void CPerformanceConfig::SetPan (unsigned nValue, unsigned nTG) void CPerformanceConfig::SetInsertFX (unsigned nValue, unsigned nTG) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); m_nInsertFX[nTG] = nValue; } void CPerformanceConfig::SetInsertFXParams (std::vector pParams, unsigned nTG) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); m_sInsertFXParams[nTG] = VectorToString(pParams); } void CPerformanceConfig::SetMidiFX (unsigned nValue, unsigned nTG) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); m_nMidiFX[nTG] = nValue; } void CPerformanceConfig::SetMidiFXParams (std::vector pParams, unsigned nTG) { - assert (nTG < CConfig::ToneGenerators); + assert (nTG < CConfig::AllToneGenerators); m_sMidiFXParams[nTG] = VectorToString(pParams); }