wirtz
/
MiniDexed
mirror of https://github.com/probonopd/MiniDexed
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added config property to disable FXs

Browse Source
pull/795/head
Javier Nonis 1 month ago
parent 6220ce7d84
commit 2aa5256c2f
3 changed files with 119 additions and 93 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      src/config.cpp
  2. 5
      src/config.h
  3. 200
      src/minidexed.cpp

7
src/config.cpp
Unescape View File

@ -200,6 +200,8 @@ void CConfig::Load (void)
m_bProfileEnabled = m_Properties.GetNumber ("ProfileEnabled", 0) != 0; m_bProfileEnabled = m_Properties.GetNumber ("ProfileEnabled", 0) != 0;
m_bPerformanceSelectToLoad = m_Properties.GetNumber ("PerformanceSelectToLoad", 1) != 0; m_bPerformanceSelectToLoad = m_Properties.GetNumber ("PerformanceSelectToLoad", 1) != 0;
m_bPerformanceSelectChannel = m_Properties.GetNumber ("PerformanceSelectChannel", 0); m_bPerformanceSelectChannel = m_Properties.GetNumber ("PerformanceSelectChannel", 0);
m_bFXEnabled = m_Properties.GetNumber("FXEnabled", 1) != 0;
} }
unsigned CConfig::GetToneGenerators (void) const unsigned CConfig::GetToneGenerators (void) const
@ -722,3 +724,8 @@ unsigned CConfig::GetPerformanceSelectChannel (void) const
{ {
return m_bPerformanceSelectChannel; return m_bPerformanceSelectChannel;
} }
bool CConfig::GetFXEnabled (void) const
{
return m_bFXEnabled;
}

5
src/config.h
Unescape View File

@ -241,6 +241,9 @@ public:
bool GetPerformanceSelectToLoad (void) const; bool GetPerformanceSelectToLoad (void) const;
unsigned GetPerformanceSelectChannel (void) const; unsigned GetPerformanceSelectChannel (void) const;
// Enable/Disable FXs
bool GetFXEnabled (void) const;
private: private:
CPropertiesFatFsFile m_Properties; CPropertiesFatFsFile m_Properties;
@ -355,6 +358,8 @@ private:
bool m_bProfileEnabled; bool m_bProfileEnabled;
bool m_bPerformanceSelectToLoad; bool m_bPerformanceSelectToLoad;
unsigned m_bPerformanceSelectChannel; unsigned m_bPerformanceSelectChannel;
bool m_bFXEnabled;
}; };
#endif #endif

200
src/minidexed.cpp
Unescape View File

@ -1521,53 +1521,59 @@ void CMiniDexed::ProcessSound (void)
m_pTG[0]->getSamples (SampleBuffer[indexL], nFrames); m_pTG[0]->getSamples (SampleBuffer[indexL], nFrames);
m_InsertFXSpinLock[0]->Acquire(); if (m_pConfig->GetFXEnabled())
m_InsertFX[0]->process(SampleBuffer[indexL], SampleBuffer[indexL], SampleBuffer[indexL], SampleBuffer[indexR], nFrames); {
m_InsertFXSpinLock[0]->Release(); m_InsertFXSpinLock[0]->Acquire();
m_InsertFX[0]->process(SampleBuffer[indexL], SampleBuffer[indexL], SampleBuffer[indexL], SampleBuffer[indexR], nFrames);
send_fx1_mixer->doAddMix(0, SampleBuffer[indexL], SampleBuffer[indexR]); m_InsertFXSpinLock[0]->Release();
send_fx2_mixer->doAddMix(0, SampleBuffer[indexL], SampleBuffer[indexR]);
send_fx1_mixer->doAddMix(0, SampleBuffer[indexL], SampleBuffer[indexR]);
// BEGIN adding send fx 1 send_fx2_mixer->doAddMix(0, SampleBuffer[indexL], SampleBuffer[indexR]);
float32_t SendFXOutputBuffer[2][nFrames];
float32_t SendFXMixBuffer[2][nFrames]; // BEGIN adding send fx 1
arm_fill_f32(0.0f, SendFXMixBuffer[indexR], nFrames); float32_t SendFXOutputBuffer[2][nFrames];
arm_fill_f32(0.0f, SendFXMixBuffer[indexL], nFrames); float32_t SendFXMixBuffer[2][nFrames];
arm_fill_f32(0.0f, SendFXMixBuffer[indexR], nFrames);
m_SendFX1SpinLock.Acquire (); arm_fill_f32(0.0f, SendFXMixBuffer[indexL], nFrames);
send_fx1_mixer->getMix(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
m_SendFX1->process(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR], SendFXOutputBuffer[indexL], SendFXOutputBuffer[indexR], nFrames); m_SendFX1SpinLock.Acquire ();
m_SendFX1SpinLock.Release (); send_fx1_mixer->getMix(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
m_SendFX1->process(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR], SendFXOutputBuffer[indexL], SendFXOutputBuffer[indexR], nFrames);
// send to FX 2 m_SendFX1SpinLock.Release ();
send_fx2_mixer->doAddMix(CConfig::SendFX2MixerChannels - 1, SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
// send to FX 2
// scale down and add left send fx buffer by send fx level send_fx2_mixer->doAddMix(CConfig::SendFX2MixerChannels - 1, SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX1Level, SendFXOutputBuffer[indexL], nFrames);
arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames); // scale down and add left send fx buffer by send fx level
// scale down and add right send fx buffer by send fx level arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX1Level, SendFXOutputBuffer[indexL], nFrames);
arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX1Level, SendFXOutputBuffer[indexR], nFrames); arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames);
arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames); // scale down and add right send fx buffer by send fx level
// END adding send fx 1 arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX1Level, SendFXOutputBuffer[indexR], nFrames);
arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames);
// END adding send fx 1
// BEGIN adding send fx 2
m_SendFX2SpinLock.Acquire (); // BEGIN adding send fx 2
send_fx2_mixer->getMix(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]); m_SendFX2SpinLock.Acquire ();
m_SendFX2->process(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR], SendFXOutputBuffer[indexL], SendFXOutputBuffer[indexR], nFrames); send_fx2_mixer->getMix(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
m_SendFX2SpinLock.Release (); m_SendFX2->process(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR], SendFXOutputBuffer[indexL], SendFXOutputBuffer[indexR], nFrames);
m_SendFX2SpinLock.Release ();
// scale down and add left send fx buffer by send fx level
arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX2Level, SendFXOutputBuffer[indexL], nFrames); // scale down and add left send fx buffer by send fx level
arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames); arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX2Level, SendFXOutputBuffer[indexL], nFrames);
// scale down and add right send fx buffer by send fx level arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames);
arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX2Level, SendFXOutputBuffer[indexR], nFrames); // scale down and add right send fx buffer by send fx level
arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames); arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX2Level, SendFXOutputBuffer[indexR], nFrames);
// END adding send fx 2 arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames);
// END adding send fx 2
m_MasterFXSpinLock.Acquire ();
m_MasterFX->process(SampleBuffer[indexL], SampleBuffer[indexR], SampleBuffer[indexL], SampleBuffer[indexR], nFrames); m_MasterFXSpinLock.Acquire ();
m_MasterFXSpinLock.Release (); m_MasterFX->process(SampleBuffer[indexL], SampleBuffer[indexR], SampleBuffer[indexL], SampleBuffer[indexR], nFrames);
m_MasterFXSpinLock.Release ();
}
else
{
memcpy(SampleBuffer[indexR], SampleBuffer[indexR], nFrames * sizeof(float32_t));
}
// swap stereo channels if needed prior to writing back out // swap stereo channels if needed prior to writing back out
if (m_bChannelsSwapped) if (m_bChannelsSwapped)
@ -1634,7 +1640,8 @@ void CMiniDexed::ProcessSound (void)
m_pTG[i]->getSamples (m_OutputLevel[i][0], nFrames); m_pTG[i]->getSamples (m_OutputLevel[i][0], nFrames);
if (!m_bQuadDAC8Chan) { if (!m_bQuadDAC8Chan && m_pConfig->GetFXEnabled())
{
m_InsertFXSpinLock[i]->Acquire(); m_InsertFXSpinLock[i]->Acquire();
m_InsertFX[i]->process(m_OutputLevel[i][0], m_OutputLevel[i][0], m_OutputLevel[i][0], m_OutputLevel[i][1], nFrames); m_InsertFX[i]->process(m_OutputLevel[i][0], m_OutputLevel[i][0], m_OutputLevel[i][0], m_OutputLevel[i][1], nFrames);
m_InsertFXSpinLock[i]->Release(); m_InsertFXSpinLock[i]->Release();
@ -1710,8 +1717,12 @@ void CMiniDexed::ProcessSound (void)
for (uint8_t i = 0; i < m_nToneGenerators; i++) for (uint8_t i = 0; i < m_nToneGenerators; i++)
{ {
tg_mixer->doAddMix(i, m_OutputLevel[i][indexL], m_OutputLevel[i][indexR]); tg_mixer->doAddMix(i, m_OutputLevel[i][indexL], m_OutputLevel[i][indexR]);
send_fx1_mixer->doAddMix(i, m_OutputLevel[i][indexL], m_OutputLevel[i][indexR]);
send_fx2_mixer->doAddMix(i, m_OutputLevel[i][indexL], m_OutputLevel[i][indexR]); if (m_pConfig->GetFXEnabled())
{
send_fx1_mixer->doAddMix(i, m_OutputLevel[i][indexL], m_OutputLevel[i][indexR]);
send_fx2_mixer->doAddMix(i, m_OutputLevel[i][indexL], m_OutputLevel[i][indexR]);
}
} }
// END TG mixing // END TG mixing
@ -1722,49 +1733,52 @@ void CMiniDexed::ProcessSound (void)
// get the mix of all TGs // get the mix of all TGs
tg_mixer->getMix(SampleBuffer[indexL], SampleBuffer[indexR]); tg_mixer->getMix(SampleBuffer[indexL], SampleBuffer[indexR]);
// BEGIN adding send fx 1 if (m_pConfig->GetFXEnabled())
float32_t SendFXOutputBuffer[2][nFrames]; {
float32_t SendFXMixBuffer[2][nFrames]; // BEGIN adding send fx 1
arm_fill_f32(0.0f, SendFXOutputBuffer[indexL], nFrames); float32_t SendFXOutputBuffer[2][nFrames];
arm_fill_f32(0.0f, SendFXOutputBuffer[indexR], nFrames); float32_t SendFXMixBuffer[2][nFrames];
arm_fill_f32(0.0f, SendFXMixBuffer[indexR], nFrames); arm_fill_f32(0.0f, SendFXOutputBuffer[indexL], nFrames);
arm_fill_f32(0.0f, SendFXMixBuffer[indexL], nFrames); arm_fill_f32(0.0f, SendFXOutputBuffer[indexR], nFrames);
arm_fill_f32(0.0f, SendFXMixBuffer[indexR], nFrames);
m_SendFX1SpinLock.Acquire (); arm_fill_f32(0.0f, SendFXMixBuffer[indexL], nFrames);
send_fx1_mixer->getMix(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
m_SendFX1->process(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR], SendFXOutputBuffer[indexL], SendFXOutputBuffer[indexR], nFrames); m_SendFX1SpinLock.Acquire ();
m_SendFX1SpinLock.Release (); send_fx1_mixer->getMix(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
m_SendFX1->process(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR], SendFXOutputBuffer[indexL], SendFXOutputBuffer[indexR], nFrames);
// send to FX 2 m_SendFX1SpinLock.Release ();
arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX1SendFXLevel, SendFXMixBuffer[indexL], nFrames);
arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX1SendFXLevel, SendFXMixBuffer[indexR], nFrames); // send to FX 2
send_fx2_mixer->doAddMix(CConfig::SendFX2MixerChannels - 1, SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]); arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX1SendFXLevel, SendFXMixBuffer[indexL], nFrames);
arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX1SendFXLevel, SendFXMixBuffer[indexR], nFrames);
// scale down and add left reverb buffer by reverb level send_fx2_mixer->doAddMix(CConfig::SendFX2MixerChannels - 1, SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX1Level, SendFXOutputBuffer[indexL], nFrames);
arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames); // scale down and add left reverb buffer by reverb level
// scale down and add right reverb buffer by reverb level arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX1Level, SendFXOutputBuffer[indexL], nFrames);
arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX1Level, SendFXOutputBuffer[indexR], nFrames); arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames);
arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames); // scale down and add right reverb buffer by reverb level
// END adding send fx 1 arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX1Level, SendFXOutputBuffer[indexR], nFrames);
arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames);
// BEGIN adding send fx 2 // END adding send fx 1
m_SendFX2SpinLock.Acquire ();
send_fx2_mixer->getMix(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]); // BEGIN adding send fx 2
m_SendFX2->process(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR], SendFXOutputBuffer[indexL], SendFXOutputBuffer[indexR], nFrames); m_SendFX2SpinLock.Acquire ();
m_SendFX2SpinLock.Release (); send_fx2_mixer->getMix(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR]);
m_SendFX2->process(SendFXMixBuffer[indexL], SendFXMixBuffer[indexR], SendFXOutputBuffer[indexL], SendFXOutputBuffer[indexR], nFrames);
// scale down and add left reverb buffer by reverb level m_SendFX2SpinLock.Release ();
arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX2Level, SendFXOutputBuffer[indexL], nFrames);
arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames); // scale down and add left reverb buffer by reverb level
// scale down and add right reverb buffer by reverb level arm_scale_f32(SendFXOutputBuffer[indexL], m_SendFX2Level, SendFXOutputBuffer[indexL], nFrames);
arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX2Level, SendFXOutputBuffer[indexR], nFrames); arm_add_f32(SampleBuffer[indexL], SendFXOutputBuffer[indexL], SampleBuffer[indexL], nFrames);
arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames); // scale down and add right reverb buffer by reverb level
// END adding send fx 2 arm_scale_f32(SendFXOutputBuffer[indexR], m_SendFX2Level, SendFXOutputBuffer[indexR], nFrames);
arm_add_f32(SampleBuffer[indexR], SendFXOutputBuffer[indexR], SampleBuffer[indexR], nFrames);
m_MasterFXSpinLock.Acquire (); // END adding send fx 2
m_MasterFX->process(SampleBuffer[indexL], SampleBuffer[indexR], SampleBuffer[indexL], SampleBuffer[indexR], nFrames);
m_MasterFXSpinLock.Release (); m_MasterFXSpinLock.Acquire ();
m_MasterFX->process(SampleBuffer[indexL], SampleBuffer[indexR], SampleBuffer[indexL], SampleBuffer[indexR], nFrames);
m_MasterFXSpinLock.Release ();
}
// swap stereo channels if needed prior to writing back out // swap stereo channels if needed prior to writing back out
if (m_bChannelsSwapped) if (m_bChannelsSwapped)

Write Preview
Loading…
Cancel
Save