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

Removing the Chorus Feedback parameter that makes no sense

Browse Source
pull/409/head
abscisys 2 years ago
parent a376b41e72
commit dc5165e91b
9 changed files with 7 additions and 50 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. 11
      src/fx_chorus.cpp
  2. 3
      src/fx_chorus.h
  3. 13
      src/minidexed.cpp
  4. 1
      src/minidexed.h
  5. 5
      src/performance.ini
  6. 16
      src/performanceconfig.cpp
  7. 3
      src/performanceconfig.h
  8. 3
      src/test/fxrack_test.cpp
  9. 2
      src/uimenu.cpp

11
src/fx_chorus.cpp
Unescape View File

@ -24,7 +24,6 @@ Chorus::Chorus(float32_t sampling_rate) :
this->setRate(0.1f);
this->setDepth(0.15f);
this->setFeedback(0.15f);
}
Chorus::~Chorus()
@ -91,13 +90,3 @@ float32_t Chorus::getDepth() const
{
return this->depth_;
}
void Chorus::setFeedback(float32_t feedback)
{
this->feedback_ = constrain(feedback, 0.0f, 1.0f);
}
float32_t Chorus::getFeedback() const
{
return this->feedback_;
}

3
src/fx_chorus.h
Unescape View File

@ -46,9 +46,6 @@ public:
void setRate(float32_t rate);
float32_t getRate() const;
void setFeedback(float32_t feedback);
float32_t getFeedback() const;
private:
typedef FxEngine<2048, FORMAT_16_BIT, false> Engine;
Engine engine_;

13
src/minidexed.cpp
Unescape View File

@ -174,9 +174,8 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
// FXChain > Chorus parameters
this->SetParameter(ParameterFXChainChorusEnable, 1);
this->SetParameter(ParameterFXChainChorusWet, 50);
this->SetParameter(ParameterFXChainChorusRate, 15);
this->SetParameter(ParameterFXChainChorusDepth, 10);
this->SetParameter(ParameterFXChainChorusFeedback, 20);
this->SetParameter(ParameterFXChainChorusRate, 50);
this->SetParameter(ParameterFXChainChorusDepth, 50);
// FXChain > Flanger parameters
this->SetParameter(ParameterFXChainFlangerEnable, 1);
@ -803,12 +802,6 @@ void CMiniDexed::SetParameter (TParameter Parameter, int nValue)
this->fx_rack->getChorus()->setDepth(nValue / 9.9f);
this->m_FXSpinLock.Release();
break;
case ParameterFXChainChorusFeedback:
nValue = constrain((int)nValue, 0, 99);
this->m_FXSpinLock.Acquire();
this->fx_rack->getChorus()->setFeedback(nValue / 99.0f);
this->m_FXSpinLock.Release();
break;
// FXChain > Flanger parameters
case ParameterFXChainFlangerEnable:
@ -1400,7 +1393,6 @@ bool CMiniDexed::DoSavePerformance (void)
this->m_PerformanceConfig.SetFXChainChorusWet(this->m_nParameter[ParameterFXChainChorusWet]);
this->m_PerformanceConfig.SetFXChainChorusRate(this->m_nParameter[ParameterFXChainChorusRate]);
this->m_PerformanceConfig.SetFXChainChorusDepth(this->m_nParameter[ParameterFXChainChorusDepth]);
this->m_PerformanceConfig.SetFXChainChorusFeedback(this->m_nParameter[ParameterFXChainChorusFeedback]);
this->m_PerformanceConfig.SetFXChainFlangerEnable(!!this->m_nParameter[ParameterFXChainFlangerEnable]);
this->m_PerformanceConfig.SetFXChainFlangerWet(this->m_nParameter[ParameterFXChainFlangerWet]);
this->m_PerformanceConfig.SetFXChainFlangerDelayTime(this->m_nParameter[ParameterFXChainFlangerDelayTime]);
@ -1828,7 +1820,6 @@ void CMiniDexed::LoadPerformanceParameters(void)
this->SetParameter(ParameterFXChainChorusWet, this->m_PerformanceConfig.GetFXChainChorusWet());
this->SetParameter(ParameterFXChainChorusRate, this->m_PerformanceConfig.GetFXChainChorusRate());
this->SetParameter(ParameterFXChainChorusDepth, this->m_PerformanceConfig.GetFXChainChorusDepth());
this->SetParameter(ParameterFXChainChorusFeedback, this->m_PerformanceConfig.GetFXChainChorusFeedback());
this->SetParameter(ParameterFXChainFlangerEnable, this->m_PerformanceConfig.GetFXChainFlangerEnable());
this->SetParameter(ParameterFXChainFlangerWet, this->m_PerformanceConfig.GetFXChainFlangerWet());
this->SetParameter(ParameterFXChainFlangerDelayTime, this->m_PerformanceConfig.GetFXChainFlangerDelayTime());

1
src/minidexed.h
Unescape View File

@ -156,7 +156,6 @@ public:
ParameterFXChainChorusWet,
ParameterFXChainChorusRate,
ParameterFXChainChorusDepth,
ParameterFXChainChorusFeedback,
// FXChain > Flanger parameters
ParameterFXChainFlangerEnable,

5
src/performance.ini
Unescape View File

@ -291,9 +291,8 @@ FXChainTubeWet=50
FXChainTubeOverdrive=10
FXChainChorusEnable=0
FXChainChorusWet=50
FXChainChorusRate=15
FXChainChorusDepth=10
FXChainChorusFeedback=20
FXChainChorusRate=40
FXChainChorusDepth=50
FXChainFlangerEnable=0
FXChainFlangerWet=50
FXChainFlangerDelayTime=10

16
src/performanceconfig.cpp
Unescape View File

@ -167,9 +167,8 @@ bool CPerformanceConfig::Load (void)
this->m_nFXChainTubeOverdrive = this->m_Properties.GetNumber("FXChainTubeOverdrive", 10);
this->m_bFXChainChorusEnable = this->m_Properties.GetNumber("FXChainChorusEnable", 1);
this->m_nFXChainChorusWet = this->m_Properties.GetNumber("FXChainChorusWet", 50);
this->m_nFXChainChorusRate = this->m_Properties.GetNumber("FXChainChorusRate", 15);
this->m_nFXChainChorusDepth = this->m_Properties.GetNumber("FXChainChorusDepth", 10);
this->m_nFXChainChorusFeedback = this->m_Properties.GetNumber("FXChainChorusFeedback", 20);
this->m_nFXChainChorusRate = this->m_Properties.GetNumber("FXChainChorusRate", 50);
this->m_nFXChainChorusDepth = this->m_Properties.GetNumber("FXChainChorusDepth", 50);
this->m_bFXChainFlangerEnable = this->m_Properties.GetNumber("FXChainFlangerEnable", 1);
this->m_nFXChainFlangerWet = this->m_Properties.GetNumber("FXChainFlangerWet", 50);
this->m_nFXChainFlangerDelayTime = this->m_Properties.GetNumber("FXChainFlangerDelayTime", 10);
@ -325,7 +324,6 @@ bool CPerformanceConfig::Save (void)
this->m_Properties.SetNumber("FXChainChorusWet", m_nFXChainChorusWet);
this->m_Properties.SetNumber("FXChainChorusRate", m_nFXChainChorusRate);
this->m_Properties.SetNumber("FXChainChorusDepth", m_nFXChainChorusDepth);
this->m_Properties.SetNumber("FXChainChorusFeedback", m_nFXChainChorusFeedback);
this->m_Properties.SetNumber("FXChainFlangerEnable", m_bFXChainFlangerEnable ? 1 : 0);
this->m_Properties.SetNumber("FXChainFlangerWet", m_nFXChainFlangerWet);
this->m_Properties.SetNumber("FXChainFlangerDelayTime", m_nFXChainFlangerDelayTime);
@ -1046,11 +1044,6 @@ unsigned CPerformanceConfig::GetFXChainChorusDepth(void) const
return this->m_nFXChainChorusDepth;
}
unsigned CPerformanceConfig::GetFXChainChorusFeedback(void) const
{
return this->m_nFXChainChorusFeedback;
}
bool CPerformanceConfig::GetFXChainFlangerEnable(void) const
{
return this->m_bFXChainFlangerEnable;
@ -1221,11 +1214,6 @@ void CPerformanceConfig::SetFXChainChorusDepth(unsigned nValue)
this->m_nFXChainChorusDepth = nValue;
}
void CPerformanceConfig::SetFXChainChorusFeedback(unsigned nValue)
{
this->m_nFXChainChorusFeedback = nValue;
}
void CPerformanceConfig::SetFXChainFlangerEnable(bool bValue)
{
this->m_bFXChainFlangerEnable = bValue;

3
src/performanceconfig.h
Unescape View File

@ -127,7 +127,6 @@ public:
unsigned GetFXChainChorusWet(void) const;
unsigned GetFXChainChorusRate(void) const;
unsigned GetFXChainChorusDepth(void) const;
unsigned GetFXChainChorusFeedback(void) const;
bool GetFXChainFlangerEnable(void) const;
unsigned GetFXChainFlangerWet(void) const;
unsigned GetFXChainFlangerDelayTime(void) const;
@ -163,7 +162,6 @@ public:
void SetFXChainChorusWet(unsigned nValue);
void SetFXChainChorusRate(unsigned nValue);
void SetFXChainChorusDepth(unsigned nValue);
void SetFXChainChorusFeedback(unsigned nValue);
void SetFXChainFlangerEnable(bool bValue);
void SetFXChainFlangerWet(unsigned nValue);
void SetFXChainFlangerDelayTime(unsigned nValue);
@ -268,7 +266,6 @@ private:
unsigned m_nFXChainChorusWet;
unsigned m_nFXChainChorusRate;
unsigned m_nFXChainChorusDepth;
unsigned m_nFXChainChorusFeedback;
bool m_bFXChainFlangerEnable;
unsigned m_nFXChainFlangerWet;
unsigned m_nFXChainFlangerDelayTime;

3
src/test/fxrack_test.cpp
Unescape View File

@ -191,9 +191,8 @@ int main()
rack->getChorus()->setEnable(true);
rack->getChorus()->setWetLevel(0.5f);
rack->getChorus()->setRate(0.5f);
rack->getChorus()->setRate(0.4f);
rack->getChorus()->setDepth(0.5f);
rack->getChorus()->setFeedback(0.15f);
rack->getPhaser()->setEnable(false);

2
src/uimenu.cpp
Unescape View File

@ -170,7 +170,6 @@ const CUIMenu::TMenuItem CUIMenu::s_FXChainChorus[] =
{"Wet Lvl", EditGlobalParameter, 0, CMiniDexed::ParameterFXChainChorusWet},
{"Rate", EditGlobalParameter, 0, CMiniDexed::ParameterFXChainChorusRate},
{"Depth", EditGlobalParameter, 0, CMiniDexed::ParameterFXChainChorusDepth},
{"Feedbck", EditGlobalParameter, 0, CMiniDexed::ParameterFXChainChorusFeedback},
{0}
};
@ -322,7 +321,6 @@ const CUIMenu::TParameter CUIMenu::s_GlobalParameter[CMiniDexed::ParameterUnknow
{0, 99, 1}, // ParameterFXChainChorusWet
{0, 99, 1}, // ParameterFXChainChorusRate
{0, 99, 1}, // ParameterFXChainChorusDepth
{0, 99, 1}, // ParameterFXChainChorusFeedback
// FXChain > Flanger parameters
{0, 1, 1, ToOnOff}, // ParameterFXChainFlangerEnable

Write Preview
Loading…
Cancel
Save