commit 2454b5dd1041b77a33faa740053885f0256a48fb parent d95863cc152084991ba1a198ac8a8c2b54fe07fe Author: fundamental <[email protected]> Date: Sat, 22 Feb 2020 12:23:22 -0500 Merge remote-tracking branch 'origin/master' Diffstat:
37 files changed, 264 insertions(+), 196 deletions(-)
diff --git a/src/Effects/Alienwah.cpp b/src/Effects/Alienwah.cpp @@ -102,7 +102,7 @@ void Alienwah::out(const Stereo<float *> &smp) complex<float> tmp = clfol * x + oldclfol * x1; complex<float> out = tmp * oldl[oldk]; - out += (1 - fabs(fb)) * smp.l[i] * pangainL; + out += (1 - fabsf(fb)) * smp.l[i] * pangainL; oldl[oldk] = out; float l = out.real() * 10.0f * (fb + 0.1f); @@ -111,7 +111,7 @@ void Alienwah::out(const Stereo<float *> &smp) tmp = clfor * x + oldclfor * x1; out = tmp * oldr[oldk]; - out += (1 - fabs(fb)) * smp.r[i] * pangainR; + out += (1 - fabsf(fb)) * smp.r[i] * pangainR; oldr[oldk] = out; float r = out.real() * 10.0f * (fb + 0.1f); @@ -149,7 +149,7 @@ void Alienwah::setdepth(unsigned char _Pdepth) void Alienwah::setfb(unsigned char _Pfb) { Pfb = _Pfb; - fb = fabs((Pfb - 64.0f) / 64.1f); + fb = fabsf((Pfb - 64.0f) / 64.1f); fb = sqrtf(fb); if(fb < 0.4f) fb = 0.4f; @@ -183,11 +183,11 @@ void Alienwah::setdelay(unsigned char _Pdelay) cleanup(); } -void Alienwah::setpreset(unsigned char npreset) +unsigned char Alienwah::getpresetpar(unsigned char npreset, unsigned int npar) { - const int PRESET_SIZE = 11; - const int NUM_PRESETS = 4; - unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { +#define PRESET_SIZE 11 +#define NUM_PRESETS 4 + static const unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { //AlienWah1 {127, 64, 70, 0, 0, 62, 60, 105, 25, 0, 64}, //AlienWah2 @@ -197,17 +197,25 @@ void Alienwah::setpreset(unsigned char npreset) //AlienWah4 {93, 64, 25, 0, 1, 66, 101, 11, 47, 0, 86} }; + if(npreset < NUM_PRESETS && npar < PRESET_SIZE) { + if (npar == 0 && insertion == 0) { + /* lower the volume if this is system effect */ + return presets[npreset][npar] / 2; + } + return presets[npreset][npar]; + } + return 0; +} +void Alienwah::setpreset(unsigned char npreset) +{ if(npreset >= NUM_PRESETS) npreset = NUM_PRESETS - 1; - for(int n = 0; n < PRESET_SIZE; ++n) - changepar(n, presets[npreset][n]); - if(insertion == 0) - changepar(0, presets[npreset][0] / 2); //lower the volume if this is system effect + for(int n = 0; n != 128; n++) + changepar(n, getpresetpar(npreset, n)); Ppreset = npreset; } - void Alienwah::changepar(int npar, unsigned char value) { switch(npar) { diff --git a/src/Effects/Alienwah.h b/src/Effects/Alienwah.h @@ -30,6 +30,7 @@ class Alienwah:public Effect ~Alienwah(); void out(const Stereo<float *> &smp); + unsigned char getpresetpar(unsigned char npreset, unsigned int npar); void setpreset(unsigned char npreset); void changepar(int npar, unsigned char value); unsigned char getpar(int npar) const; diff --git a/src/Effects/Chorus.cpp b/src/Effects/Chorus.cpp @@ -210,12 +210,11 @@ void Chorus::setvolume(unsigned char _Pvolume) volume = (!insertion) ? 1.0f : outvolume; } - -void Chorus::setpreset(unsigned char npreset) +unsigned char Chorus::getpresetpar(unsigned char npreset, unsigned int npar) { - const int PRESET_SIZE = 12; - const int NUM_PRESETS = 10; - unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { +#define PRESET_SIZE 12 +#define NUM_PRESETS 10 + static const unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { //Chorus1 {64, 64, 50, 0, 0, 90, 40, 85, 64, 119, 0, 0}, //Chorus2 @@ -237,15 +236,21 @@ void Chorus::setpreset(unsigned char npreset) //Flange5 {64, 64, 55, 105, 0, 24, 39, 19, 17, 0, 0, 1} }; + if(npreset < NUM_PRESETS && npar < PRESET_SIZE) { + return presets[npreset][npar]; + } + return 0; +} +void Chorus::setpreset(unsigned char npreset) +{ if(npreset >= NUM_PRESETS) npreset = NUM_PRESETS - 1; - for(int n = 0; n < PRESET_SIZE; ++n) - changepar(n, presets[npreset][n]); + for(int n = 0; n != 128; n++) + changepar(n, getpresetpar(npreset, n)); Ppreset = npreset; } - void Chorus::changepar(int npar, unsigned char value) { switch(npar) { diff --git a/src/Effects/Chorus.h b/src/Effects/Chorus.h @@ -29,6 +29,7 @@ class Chorus:public Effect /**Destructor*/ ~Chorus(); void out(const Stereo<float *> &input); + unsigned char getpresetpar(unsigned char npreset, unsigned int npar); void setpreset(unsigned char npreset); /** * Sets the value of the chosen variable diff --git a/src/Effects/Distorsion.cpp b/src/Effects/Distorsion.cpp @@ -218,37 +218,44 @@ void Distorsion::sethpf(unsigned char _Phpf) hpfr->setfreq(fr); } - -void Distorsion::setpreset(unsigned char npreset) +unsigned char Distorsion::getpresetpar(unsigned char npreset, unsigned int npar) { - const int PRESET_SIZE = 11; - const int NUM_PRESETS = 6; - unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { +#define PRESET_SIZE 13 +#define NUM_PRESETS 6 + static const unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { //Overdrive 1 - {127, 64, 35, 56, 70, 0, 0, 96, 0, 0, 0}, + {127, 64, 35, 56, 70, 0, 0, 96, 0, 0, 0, 32, 64}, //Overdrive 2 - {127, 64, 35, 29, 75, 1, 0, 127, 0, 0, 0}, + {127, 64, 35, 29, 75, 1, 0, 127, 0, 0, 0, 32, 64}, //A. Exciter 1 - {64, 64, 35, 75, 80, 5, 0, 127, 105, 1, 0}, + {64, 64, 35, 75, 80, 5, 0, 127, 105, 1, 0, 32, 64}, //A. Exciter 2 - {64, 64, 35, 85, 62, 1, 0, 127, 118, 1, 0}, + {64, 64, 35, 85, 62, 1, 0, 127, 118, 1, 0, 32, 64}, //Guitar Amp - {127, 64, 35, 63, 75, 2, 0, 55, 0, 0, 0}, + {127, 64, 35, 63, 75, 2, 0, 55, 0, 0, 0, 32, 64}, //Quantisize - {127, 64, 35, 88, 75, 4, 0, 127, 0, 1, 0} + {127, 64, 35, 88, 75, 4, 0, 127, 0, 1, 0, 32, 64} }; + if(npreset < NUM_PRESETS && npar < PRESET_SIZE) { + if(npar == 0 && insertion == 0) { + /* lower the volume if this is system effect */ + return (3 * presets[npreset][npar]) / 2; + } + return presets[npreset][npar]; + } + return 0; +} +void Distorsion::setpreset(unsigned char npreset) +{ if(npreset >= NUM_PRESETS) npreset = NUM_PRESETS - 1; - for(int n = 0; n < PRESET_SIZE; ++n) - changepar(n, presets[npreset][n]); - if(!insertion) //lower the volume if this is system effect - changepar(0, (int) (presets[npreset][0] / 1.5f)); + for(int n = 0; n != 128; n++) + changepar(n, getpresetpar(npreset, n)); Ppreset = npreset; cleanup(); } - void Distorsion::changepar(int npar, unsigned char value) { switch(npar) { diff --git a/src/Effects/Distorsion.h b/src/Effects/Distorsion.h @@ -25,6 +25,7 @@ class Distorsion:public Effect Distorsion(EffectParams pars); ~Distorsion(); void out(const Stereo<float *> &smp); + unsigned char getpresetpar(unsigned char npreset, unsigned int npar); void setpreset(unsigned char npreset); void changepar(int npar, unsigned char value); unsigned char getpar(int npar) const; diff --git a/src/Effects/DynamicFilter.cpp b/src/Effects/DynamicFilter.cpp @@ -273,11 +273,11 @@ void DynamicFilter::setfilterpreset(unsigned char npreset) reinitfilter(); } -void DynamicFilter::setpreset(unsigned char npreset, bool protect) +unsigned char DynamicFilter::getpresetpar(unsigned char npreset, unsigned int npar) { - const int PRESET_SIZE = 10; - const int NUM_PRESETS = 5; - unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { +#define PRESET_SIZE 10 +#define NUM_PRESETS 5 + static const unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { //WahWah {110, 64, 80, 0, 0, 64, 0, 90, 0, 60}, //AutoWah @@ -289,20 +289,27 @@ void DynamicFilter::setpreset(unsigned char npreset, bool protect) //VocalMorph1 {127, 64, 50, 0, 0, 96, 64, 0, 0, 60} }; + if(npreset < NUM_PRESETS && npar < PRESET_SIZE) { + if(npar == 0 && insertion == 0) { + /* lower the volume if this is system effect */ + return presets[npreset][npar] / 2; + } + return presets[npreset][npar]; + } + return 0; +} +void DynamicFilter::setpreset(unsigned char npreset, bool protect) +{ if(npreset >= NUM_PRESETS) npreset = NUM_PRESETS - 1; - for(int n = 0; n < PRESET_SIZE; ++n) - changepar(n, presets[npreset][n]); - - if(insertion == 0) //lower the volume if this is system effect - changepar(0, presets[npreset][0] * 0.5f); + for(int n = 0; n != 128; n++) + changepar(n, getpresetpar(npreset, n)); Ppreset = npreset; if(!protect) setfilterpreset(npreset); } - void DynamicFilter::changepar(int npar, unsigned char value) { switch(npar) { diff --git a/src/Effects/DynamicFilter.h b/src/Effects/DynamicFilter.h @@ -27,6 +27,7 @@ class DynamicFilter:public Effect ~DynamicFilter(); void out(const Stereo<float *> &smp); + unsigned char getpresetpar(unsigned char npreset, unsigned int npar); void setpreset(unsigned char npreset) { setpreset(npreset, false); }; void setpreset(unsigned char npreset, bool protect); void changepar(int npar, unsigned char value); diff --git a/src/Effects/EQ.cpp b/src/Effects/EQ.cpp @@ -100,11 +100,6 @@ EQ::EQ(EffectParams pars) :Effect(pars) { for(int i = 0; i < MAX_EQ_BANDS; ++i) { - filter[i].Ptype = 0; - filter[i].Pfreq = 64; - filter[i].Pgain = 64; - filter[i].Pq = 64; - filter[i].Pstages = 0; filter[i].l = memory.alloc<AnalogFilter>(6, 1000.0f, 1.0f, 0, pars.srate, pars.bufsize); filter[i].r = memory.alloc<AnalogFilter>(6, 1000.0f, 1.0f, 0, pars.srate, pars.bufsize); } @@ -157,20 +152,30 @@ void EQ::setvolume(unsigned char _Pvolume) volume = (!insertion) ? 1.0f : outvolume; } - -void EQ::setpreset(unsigned char npreset) +unsigned char EQ::getpresetpar(unsigned char npreset, unsigned int npar) { - const int PRESET_SIZE = 1; - const int NUM_PRESETS = 2; - unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { +#define PRESET_SIZE 1 +#define NUM_PRESETS 2 + static const unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { {67}, //EQ 1 {67} //EQ 2 }; + if(npreset < NUM_PRESETS && npar < PRESET_SIZE) { + return presets[npreset][npar]; + } else if (npar >= 10 && npar < (10 + MAX_EQ_BANDS * 5)) { + static const unsigned char bp_preset[5] = { 0, 64, 64, 64, 0 }; + return bp_preset[npar % 5]; + } + return 0; +} + +void EQ::setpreset(unsigned char npreset) +{ if(npreset >= NUM_PRESETS) npreset = NUM_PRESETS - 1; - for(int n = 0; n < PRESET_SIZE; ++n) - changepar(n, presets[npreset][n]); + for(int n = 0; n != 128; n++) + changepar(n, getpresetpar(npreset, n)); Ppreset = npreset; } diff --git a/src/Effects/EQ.h b/src/Effects/EQ.h @@ -25,6 +25,7 @@ class EQ:public Effect EQ(EffectParams pars); ~EQ(); void out(const Stereo<float *> &smp); + unsigned char getpresetpar(unsigned char npreset, unsigned int npar); void setpreset(unsigned char npreset); void changepar(int npar, unsigned char value); unsigned char getpar(int npar) const; diff --git a/src/Effects/Echo.cpp b/src/Effects/Echo.cpp @@ -202,11 +202,11 @@ void Echo::sethidamp(unsigned char _Phidamp) hidamp = 1.0f - Phidamp / 127.0f; } -void Echo::setpreset(unsigned char npreset) +unsigned char Echo::getpresetpar(unsigned char npreset, unsigned int npar) { - const int PRESET_SIZE = 7; - const int NUM_PRESETS = 9; - unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { +#define PRESET_SIZE 7 +#define NUM_PRESETS 9 + static const unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { {67, 64, 35, 64, 30, 59, 0 }, //Echo 1 {67, 64, 21, 64, 30, 59, 0 }, //Echo 2 {67, 75, 60, 64, 30, 59, 10}, //Echo 3 @@ -217,17 +217,25 @@ void Echo::setpreset(unsigned char npreset) {81, 60, 26, 100, 127, 67, 36}, //Panning Echo 3 {62, 64, 28, 64, 100, 90, 55} //Feedback Echo }; + if(npreset < NUM_PRESETS && npar < PRESET_SIZE) { + if(npar == 0 && insertion != 0) { + /* lower the volume if this is insertion effect */ + return presets[npreset][npar] / 2; + } + return presets[npreset][npar]; + } + return 0; +} +void Echo::setpreset(unsigned char npreset) +{ if(npreset >= NUM_PRESETS) npreset = NUM_PRESETS - 1; - for(int n = 0; n < PRESET_SIZE; ++n) - changepar(n, presets[npreset][n]); - if(insertion) - setvolume(presets[npreset][0] / 2); //lower the volume if this is insertion effect + for(int n = 0; n != 128; n++) + changepar(n, getpresetpar(npreset, n)); Ppreset = npreset; } - void Echo::changepar(int npar, unsigned char value) { switch(npar) { diff --git a/src/Effects/Echo.h b/src/Effects/Echo.h @@ -27,6 +27,7 @@ class Echo:public Effect ~Echo(); void out(const Stereo<float *> &input); + unsigned char getpresetpar(unsigned char npreset, unsigned int npar); void setpreset(unsigned char npreset); /** * Sets the value of the chosen variable diff --git a/src/Effects/Effect.h b/src/Effects/Effect.h @@ -113,6 +113,13 @@ class Effect Effect(EffectParams pars); virtual ~Effect() {} /** + * Get default preset parameter value + * @param npreset chosen preset + * @param npar chosen parameter + * @return the default parameter value + **/ + virtual unsigned char getpresetpar(unsigned char npreset, unsigned int npar) = 0; + /** * Choose a preset * @param npreset number of chosen preset*/ virtual void setpreset(unsigned char npreset) = 0; diff --git a/src/Effects/EffectMgr.cpp b/src/Effects/EffectMgr.cpp @@ -180,7 +180,7 @@ EffectMgr::EffectMgr(Allocator &alloc, const SYNTH_T &synth_, setpresettype("Peffect"); memset(efxoutl, 0, synth.bufferbytes); memset(efxoutr, 0, synth.bufferbytes); - memset(settings, 0, sizeof(settings)); + memset(settings, 255, sizeof(settings)); defaults(); } @@ -249,7 +249,7 @@ void EffectMgr::changeeffectrt(int _nefx, bool avoidSmash) } if(!avoidSmash) - for(int i=0; i<128; ++i) + for(int i = 0; i != 128; i++) settings[i] = geteffectparrt(i); } @@ -257,7 +257,6 @@ void EffectMgr::changeeffect(int _nefx) { nefx = _nefx; //preset = 0; - //memset(settings, 0, sizeof(settings)); } //Obtain the effect number @@ -266,14 +265,29 @@ int EffectMgr::geteffect(void) return nefx; } +void EffectMgr::changesettingsrt(const short int *p_value) +{ + for(int i = 0; i != 128; i++) { + short int value = p_value[i]; + /* check if setting is missing */ + if(value == -1) { + if(efx) + value = efx->getpresetpar(preset, i); + else + value = 0; + } + /* update settings */ + seteffectparrt(i, value); + } +} + // Initialize An Effect in RT context void EffectMgr::init(void) { kill(); changeeffectrt(nefx, true); changepresetrt(preset, true); - for(int i=0; i<128; ++i) - seteffectparrt(i, settings[i]); + changesettingsrt(settings); } //Strip effect manager of it's realtime memory @@ -317,15 +331,17 @@ void EffectMgr::changepresetrt(unsigned char npreset, bool avoidSmash) if(efx) efx->setpreset(npreset); if(!avoidSmash) - for(int i=0; i<128; ++i) + for(int i = 0; i != 128; i++) settings[i] = geteffectparrt(i); } //Change a parameter of the current effect void EffectMgr::seteffectparrt(int npar, unsigned char value) { - if(npar<128) - settings[npar] = value; + if(npar < 0 || npar >= 128) + return; + settings[npar] = value; + if(!efx) return; try { @@ -335,23 +351,6 @@ void EffectMgr::seteffectparrt(int npar, unsigned char value) } } -//Change a parameter of the current effect -void EffectMgr::seteffectpar(int npar, unsigned char value) -{ - settings[npar] = value; -} - -//Get a parameter of the current effect -unsigned char EffectMgr::geteffectpar(int npar) -{ - if(npar<128) - return settings[npar]; - - if(!efx) - return 0; - return efx->getpar(npar); -} - unsigned char EffectMgr::geteffectparrt(int npar) { if(!efx) @@ -448,8 +447,7 @@ void EffectMgr::paste(EffectMgr &e) { changeeffectrt(e.nefx, true); changepresetrt(e.preset, true); - for(int i=0;i<128;++i) - seteffectparrt(i, e.settings[i]); + changesettingsrt(e.settings); if(dynamic_cast<DynamicFilter*>(efx)) { std::swap(filterpars, e.filterpars); efx->filterpars = filterpars; @@ -466,14 +464,18 @@ void EffectMgr::add2XML(XMLwrapper& xml) xml.addpar("preset", preset); xml.beginbranch("EFFECT_PARAMETERS"); - for(int n = 0; n < 128; ++n) { - int par = 0; - if(efx) + for(int n = 0; n != 128; n++) { + int par; + int def; + if(efx) { par = efx->getpar(n); - else if(n<128) + def = efx->getpresetpar(preset, n); + } else { par = settings[n]; - - if(par == 0) + def = -1; + } + /* don't store default values */ + if(par == def) continue; xml.beginbranch("par_no", n); xml.addpar("par", par); @@ -498,13 +500,13 @@ void EffectMgr::getfromXML(XMLwrapper& xml) preset = xml.getpar127("preset", preset); if(xml.enterbranch("EFFECT_PARAMETERS")) { - for(int n = 0; n < 128; ++n) { - seteffectpar(n, 0); //erase effect parameter - if(xml.enterbranch("par_no", n) == 0) - continue; - int par = geteffectpar(n); - seteffectpar(n, xml.getpar127("par", par)); - xml.exitbranch(); + for(int n = 0; n != 128; n++) { + if(xml.enterbranch("par_no", n) == 0) { + settings[n] = -1; /* use default */ + } else { + settings[n] = xml.getpar127("par", 0); + xml.exitbranch(); + } } assert(filterpars); if(xml.enterbranch("FILTER")) { diff --git a/src/Effects/EffectMgr.h b/src/Effects/EffectMgr.h @@ -50,13 +50,13 @@ class EffectMgr:public Presets void kill(void) REALTIME; void cleanup(void) REALTIME; + void changesettingsrt(const short int *) REALTIME; void changeeffectrt(int nefx_, bool avoidSmash=false) REALTIME; void changeeffect(int nefx_) NONREALTIME; int geteffect(void); void changepreset(unsigned char npreset) NONREALTIME; void changepresetrt(unsigned char npreset, bool avoidSmash=false) REALTIME; unsigned char getpreset(void); - void seteffectpar(int npar, unsigned char value) NONREALTIME; void seteffectparrt(int npar, unsigned char value) REALTIME; unsigned char geteffectpar(int npar); unsigned char geteffectparrt(int npar) REALTIME; @@ -101,7 +101,7 @@ class EffectMgr:public Presets * * See also: PresetExtractor.cpp */ - char settings[128]; + short int settings[128]; bool dryonly; Allocator &memory; diff --git a/src/Effects/Phaser.cpp b/src/Effects/Phaser.cpp @@ -402,12 +402,11 @@ void Phaser::setdepth(unsigned char Pdepth) depth = (float)(Pdepth) / 127.0f; } - -void Phaser::setpreset(unsigned char npreset) +unsigned char Phaser::getpresetpar(unsigned char npreset, unsigned int npar) { - const int PRESET_SIZE = 15; - const int NUM_PRESETS = 12; - unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { +#define PRESET_SIZE 15 +#define NUM_PRESETS 12 + static const unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { //Phaser //0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 {64, 64, 36, 0, 0, 64, 110, 64, 1, 0, 0, 20, @@ -438,14 +437,20 @@ void Phaser::setpreset(unsigned char npreset) {64, 64, 1, 10, 1, 64, 70, 40, 12, 10, 0, 110,1, 20, 1 } }; + if(npreset < NUM_PRESETS && npar < PRESET_SIZE) + return presets[npreset][npar]; + return 0; +} + +void Phaser::setpreset(unsigned char npreset) +{ if(npreset >= NUM_PRESETS) npreset = NUM_PRESETS - 1; - for(int n = 0; n < PRESET_SIZE; ++n) - changepar(n, presets[npreset][n]); + for(int n = 0; n != 128; n++) + changepar(n, getpresetpar(npreset, n)); Ppreset = npreset; } - void Phaser::changepar(int npar, unsigned char value) { switch(npar) { diff --git a/src/Effects/Phaser.h b/src/Effects/Phaser.h @@ -31,6 +31,7 @@ class Phaser:public Effect Phaser(EffectParams pars); ~Phaser(); void out(const Stereo<float *> &input); + unsigned char getpresetpar(unsigned char npreset, unsigned int npar); void setpreset(unsigned char npreset); void changepar(int npar, unsigned char value); unsigned char getpar(int npar) const; diff --git a/src/Effects/Reverb.cpp b/src/Effects/Reverb.cpp @@ -433,11 +433,11 @@ void Reverb::setbandwidth(unsigned char _Pbandwidth) bandwidth->setBandwidth(powf(v, 2.0f) * 200.0f); } -void Reverb::setpreset(unsigned char npreset) +unsigned char Reverb::getpresetpar(unsigned char npreset, unsigned int npar) { - const int PRESET_SIZE = 13; - const int NUM_PRESETS = 13; - unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { +#define PRESET_SIZE 13 +#define NUM_PRESETS 13 + static const unsigned char presets[NUM_PRESETS][PRESET_SIZE] = { //Cathedral1 {80, 64, 63, 24, 0, 0, 0, 85, 5, 83, 1, 64, 20}, //Cathedral2 @@ -465,17 +465,25 @@ void Reverb::setpreset(unsigned char npreset) //VeryLong2 {90, 64, 111, 30, 0, 0, 0, 114, 90, 74, 1, 80, 20} }; + if(npreset < NUM_PRESETS && npar < PRESET_SIZE) { + if (npar == 0 && insertion != 0) { + /* lower the volume if reverb is insertion effect */ + return presets[npreset][npar] / 2; + } + return presets[npreset][npar]; + } + return 0; +} +void Reverb::setpreset(unsigned char npreset) +{ if(npreset >= NUM_PRESETS) npreset = NUM_PRESETS - 1; - for(int n = 0; n < PRESET_SIZE; ++n) - changepar(n, presets[npreset][n]); - if(insertion) - changepar(0, presets[npreset][0] / 2); //lower the volume if reverb is insertion effect + for(int n = 0; n != 128; n++) + changepar(n, getpresetpar(npreset, n)); Ppreset = npreset; } - void Reverb::changepar(int npar, unsigned char value) { switch(npar) { diff --git a/src/Effects/Reverb.h b/src/Effects/Reverb.h @@ -30,6 +30,7 @@ class Reverb:public Effect void out(const Stereo<float *> &smp); void cleanup(void); + unsigned char getpresetpar(unsigned char npreset, unsigned int npar); void setpreset(unsigned char npreset); void changepar(int npar, unsigned char value); unsigned char getpar(int npar) const; diff --git a/src/Misc/Master.cpp b/src/Misc/Master.cpp @@ -1029,10 +1029,10 @@ void Master::vuUpdate(const float *outr, const float *outl) vu.outpeakl = 1e-12; vu.outpeakr = 1e-12; for(int i = 0; i < synth.buffersize; ++i) { - if(fabs(outl[i]) > vu.outpeakl) - vu.outpeakl = fabs(outl[i]); - if(fabs(outr[i]) > vu.outpeakr) - vu.outpeakr = fabs(outr[i]); + if(fabsf(outl[i]) > vu.outpeakl) + vu.outpeakl = fabsf(outl[i]); + if(fabsf(outr[i]) > vu.outpeakr) + vu.outpeakr = fabsf(outr[i]); } if((vu.outpeakl > 1.0f) || (vu.outpeakr > 1.0f)) vu.clipped = 1; @@ -1059,10 +1059,10 @@ void Master::vuUpdate(const float *outr, const float *outl) float *outr = part[npart]->partoutl, *outl = part[npart]->partoutr; for(int i = 0; i < synth.buffersize; ++i) { - if (fabs(outl[i]) > vuoutpeakpartl[npart]) - vuoutpeakpartl[npart] = fabs(outl[i]); - if (fabs(outr[i]) > vuoutpeakpartr[npart]) - vuoutpeakpartr[npart] = fabs(outr[i]); + if (fabsf(outl[i]) > vuoutpeakpartl[npart]) + vuoutpeakpartl[npart] = fabsf(outl[i]); + if (fabsf(outr[i]) > vuoutpeakpartr[npart]) + vuoutpeakpartr[npart] = fabsf(outr[i]); } } else diff --git a/src/Misc/Util.cpp b/src/Misc/Util.cpp @@ -85,22 +85,22 @@ float getdetune(unsigned char type, switch(type) { // case 1: is used for the default (see below) case 2: - cdet = fabs(cdetune * 10.0f); - findet = fabs(fdetune / 8192.0f) * 10.0f; + cdet = fabsf(cdetune * 10.0f); + findet = fabsf(fdetune / 8192.0f) * 10.0f; break; case 3: - cdet = fabs(cdetune * 100.0f); - findet = powf(10, fabs(fdetune / 8192.0f) * 3.0f) / 10.0f - 0.1f; + cdet = fabsf(cdetune * 100.0f); + findet = powf(10, fabsf(fdetune / 8192.0f) * 3.0f) / 10.0f - 0.1f; break; case 4: - cdet = fabs(cdetune * 701.95500087f); //perfect fifth + cdet = fabsf(cdetune * 701.95500087f); //perfect fifth findet = - (powf(2, fabs(fdetune / 8192.0f) * 12.0f) - 1.0f) / 4095 * 1200; + (powf(2, fabsf(fdetune / 8192.0f) * 12.0f) - 1.0f) / 4095 * 1200; break; //case ...: need to update N_DETUNE_TYPES, if you'll add more default: - cdet = fabs(cdetune * 50.0f); - findet = fabs(fdetune / 8192.0f) * 35.0f; //almost like "Paul's Sound Designer 2" + cdet = fabsf(cdetune * 50.0f); + findet = fabsf(fdetune / 8192.0f) * 35.0f; //almost like "Paul's Sound Designer 2" break; } if(finedetune < 8192) diff --git a/src/Misc/WaveShapeSmps.cpp b/src/Misc/WaveShapeSmps.cpp @@ -26,30 +26,30 @@ float polyblampres(float smp, float ws, float dMax) // [0, T] d^5/40 − d^4/12 + d^2/3 − d/2 + 7/30 // [T, 2T] −d^5/120 + d^4/24 − d^3/12 + d^2/12 − d/24 + 1/120 - float dist = fabs(smp) - ws; + float dist = fabsf(smp) - ws; float res, d1, d2, d3, d4, d5; - if (fabs(dist) < dMax) { - if (dist < -dMax/2.0f) { - d1 = (dist + dMax)/dMax*2; // [-dMax ... -dMax/2] -> [0 ... 1] + if(fabsf(dist) < dMax) { + if(dist < -dMax/2.0f) { + d1 = (dist + dMax)/dMax*2.0f; // [-dMax ... -dMax/2] -> [0 ... 1] res = powf(d1, 5.0f) / 120.0f; } - else if ( dist < 0.0) { - d1 = (dist + dMax/2)/dMax*2; // [-dMax/2 ... 0] -> [0 ... 1] + else if(dist < 0.0f) { + d1 = (dist + dMax/2.0f)/dMax*2.0f; // [-dMax/2 ... 0] -> [0 ... 1] d2 = d1*d1; d3 = d2*d1; d4 = d3*d1; d5 = d4*d1; res = (-d5/40.0f) + (d4/24.0f) + (d3/12.0f) + (d2/12.0f) + (d1/24.0f) + (1.0f/120.0f); } - else if ( dist < dMax/2.0) { - d1 = (dist)/dMax*2; //[0 ... dMax/2] -> [0 ... 1] + else if(dist < dMax/2.0f) { + d1 = dist/dMax*2.0f; //[0 ... dMax/2] -> [0 ... 1] d2 = d1*d1; d4 = d2*d2; d5 = d4*d1; res = (d5/40.0f) - (d4/12.0f) + (d2/3.0f) - (d1/2.0f) + (7.0f/30.0f); } else { - d1 = (dist - dMax/2.0)/dMax*2; //[dMax/2 ... dMax] -> [0 ... 1] + d1 = (dist - dMax/2.0f)/dMax*2.0f; //[dMax/2 ... dMax] -> [0 ... 1] d2 = d1*d1; d3 = d2*d1; d4 = d3*d1; @@ -58,10 +58,9 @@ float polyblampres(float smp, float ws, float dMax) } } else - res = 0; - - return res*dMax/2; + res = 0.0f; + return res*dMax/2.0f; } void waveShapeSmps(int n, @@ -100,7 +99,7 @@ void waveShapeSmps(int n, ws = ws * ws * ws * 20.0f + 0.0001f; //Pow for(i = 0; i < n; ++i) { smps[i] *= ws; - if(fabs(smps[i]) < 1.0f) { + if(fabsf(smps[i]) < 1.0f) { smps[i] = (smps[i] - powf(smps[i], 3.0f)) * 3.0f; if(ws < 1.0f) smps[i] /= ws; @@ -262,8 +261,8 @@ void waveShapeSmps(int n, for(i = 0; i < n; ++i) { smps[i] *= ws;// multiply signal to drive it in the saturation of the function smps[i] += offs; // add dc offset - smps[i] = smps[i] / powf(1+powf(fabs(smps[i]), par), 1/par); - smps[i] -= offs / powf(1+powf(fabs(offs), par), 1/par); + smps[i] = smps[i] / powf(1+powf(fabsf(smps[i]), par), 1/par); + smps[i] -= offs / powf(1+powf(fabsf(offs), par), 1/par); } break; case 16: @@ -274,7 +273,7 @@ void waveShapeSmps(int n, for(i = 0; i < n; ++i) { smps[i] *= ws; // multiply signal to drive it in the saturation of the function smps[i] += offs; // add dc offset - if(fabs(smps[i]) < 1.0f) + if(fabsf(smps[i]) < 1.0f) smps[i] = 1.5 * (smps[i] - (powf(smps[i], 3.0) / 3.0) ); else smps[i] = (smps[i] > 0 ? 1.0f : -1.0f); @@ -289,12 +288,12 @@ void waveShapeSmps(int n, for(i = 0; i < n; ++i) { smps[i] *= ws; // multiply signal to drive it in the saturation of the function smps[i] += offs; // add dc offset - if(fabs(smps[i]) < 1.0f) - smps[i] = smps[i]*(2-fabs(smps[i])); + if(fabsf(smps[i]) < 1.0f) + smps[i] = smps[i]*(2-fabsf(smps[i])); else smps[i] = (smps[i] > 0 ? 1.0f : -1.0f); //substract offset with distorsion function applied - smps[i] -= offs*(2-fabs(offs)); + smps[i] -= offs*(2-fabsf(offs)); } break; } diff --git a/src/Params/ADnoteParameters.cpp b/src/Params/ADnoteParameters.cpp @@ -661,7 +661,7 @@ void ADnoteVoiceParam::enable(const SYNTH_T &synth, FFTwrapper *fft, float ADnoteParameters::getBandwidthDetuneMultiplier() const { float bw = (GlobalPar.PBandwidth - 64.0f) / 64.0f; - bw = powf(2.0f, bw * powf(fabs(bw), 0.2f) * 5.0f); + bw = powf(2.0f, bw * powf(fabsf(bw), 0.2f) * 5.0f); return bw; } diff --git a/src/Params/PADnoteParameters.cpp b/src/Params/PADnoteParameters.cpp @@ -505,7 +505,7 @@ float PADnoteParameters::getprofile(float *smp, int size) f = 1.0f; break; case 2: - f = expf(-(fabs(x)) * sqrt(basepar)); + f = expf(-(fabsf(x)) * sqrt(basepar)); break; default: f = expf(-(x * x) * basepar); diff --git a/src/Synth/ADnote.cpp b/src/Synth/ADnote.cpp @@ -1033,7 +1033,7 @@ void ADnote::compute_unison_freq_rap(int nvoice) { void ADnote::setfreq(int nvoice, float in_freq) { for(int k = 0; k < unison_size[nvoice]; ++k) { - float freq = fabs(in_freq) * unison_freq_rap[nvoice][k]; + float freq = fabsf(in_freq) * unison_freq_rap[nvoice][k]; float speed = freq * synth.oscilsize_f / synth.samplerate_f; if(speed > synth.oscilsize_f) speed = synth.oscilsize_f; @@ -1050,7 +1050,7 @@ void ADnote::setfreq(int nvoice, float in_freq) void ADnote::setfreqFM(int nvoice, float in_freq) { for(int k = 0; k < unison_size[nvoice]; ++k) { - float freq = fabs(in_freq) * unison_freq_rap[nvoice][k]; + float freq = fabsf(in_freq) * unison_freq_rap[nvoice][k]; float speed = freq * synth.oscilsize_f / synth.samplerate_f; if(speed > synth.samplerate_f) speed = synth.samplerate_f; diff --git a/src/Synth/Envelope.cpp b/src/Synth/Envelope.cpp @@ -54,7 +54,7 @@ Envelope::Envelope(EnvelopeParams &pars, float basefreq, float bufferdt, case 3: envval[i] = (powf(2, 6.0f - * fabs(pars.Penvval[i] + * fabsf(pars.Penvval[i] - 64.0f) / 64.0f) - 1.0f) * 100.0f; if(pars.Penvval[i] < 64) envval[i] = -envval[i]; diff --git a/src/Synth/LFO.cpp b/src/Synth/LFO.cpp @@ -39,7 +39,7 @@ LFO::LFO(const LFOParams &lfopars, float basefreq, const AbsTime &t, WatchManage const float lfostretch = powf(basefreq / 440.0f, (stretch - 64.0f) / 63.0f); const float lfofreq = lfopars.freq * lfostretch; - phaseInc = fabs(lfofreq) * t.dt(); + phaseInc = fabsf(lfofreq) * t.dt(); if(!lfopars.Pcontinous) { if(lfopars.Pstartphase == 0) @@ -129,7 +129,7 @@ float LFO::lfoout() float lfofreq = lfopars_.freq * lfostretch; - phaseInc = fabs(lfofreq) * dt_; + phaseInc = fabsf(lfofreq) * dt_; switch(lfopars_.fel) { case consumer_location_type_t::amp: diff --git a/src/Synth/OscilGen.cpp b/src/Synth/OscilGen.cpp @@ -602,8 +602,8 @@ inline void normalize(float *smps, size_t N) //Find max float max = 0.0f; for(size_t i = 0; i < N; ++i) - if(max < fabs(smps[i])) - max = fabs(smps[i]); + if(max < fabsf(smps[i])) + max = fabsf(smps[i]); if(max < 0.00001f) max = 1.0f; @@ -829,7 +829,7 @@ void OscilGen::prepare(fft_t *freqs) hphase[i] = (Phphase[i] - 64.0f) / 64.0f * PI / (i + 1); for(int i = 0; i < MAX_AD_HARMONICS; ++i) { - const float hmagnew = 1.0f - fabs(Phmag[i] / 64.0f - 1.0f); + const float hmagnew = 1.0f - fabsf(Phmag[i] / 64.0f - 1.0f); switch(Phmagtype) { case 1: hmag[i] = expf(hmagnew * logf(0.01f)); @@ -1058,7 +1058,7 @@ short int OscilGen::get(float *smps, float freqHz, int resonance) clearAll(outoscilFFTfreqs, synth.oscilsize); - int nyquist = (int)(0.5f * synth.samplerate_f / fabs(freqHz)) + 2; + int nyquist = (int)(0.5f * synth.samplerate_f / fabsf(freqHz)) + 2; if(ADvsPAD) nyquist = (int)(synth.oscilsize / 2); if(nyquist > synth.oscilsize / 2) @@ -1110,7 +1110,7 @@ short int OscilGen::get(float *smps, float freqHz, int resonance) power = powf(15.0f, power) * 2.0f; float rndfreq = 2 * PI * RND; for(int i = 1; i < nyquist - 1; ++i) - outoscilFFTfreqs[i] *= powf(fabs(sinf(i * rndfreq)), power) + outoscilFFTfreqs[i] *= powf(fabsf(sinf(i * rndfreq)), power) * normalize; break; } @@ -1329,7 +1329,7 @@ void OscilGen::add2XML(XMLwrapper& xml) for(int i = 1; i < synth.oscilsize / 2; ++i) { float xc = basefuncFFTfreqs[i].real(); float xs = basefuncFFTfreqs[i].imag(); - if((fabs(xs) > 1e-6f) || (fabs(xc) > 1e-6f)) { + if((fabsf(xs) > 1e-6f) || (fabsf(xc) > 1e-6f)) { xml.beginbranch("BF_HARMONIC", i); xml.addparreal("cos", xc); xml.addparreal("sin", xs); @@ -1544,7 +1544,7 @@ FUNC(stretchsine) if(a > 0.0f) a *= 2; a = powf(3.0f, a); - float b = powf(fabs(x), a); + float b = powf(fabsf(x), a); if(x < 0) b = -b; return -sinf(b * PI); @@ -1565,7 +1565,7 @@ FUNC(absstretchsine) x = fmod(x + 0.5f, 1) * 2.0f - 1.0f; a = (a - 0.5f) * 9; a = powf(3.0f, a); - float b = powf(fabs(x), a); + float b = powf(fabsf(x), a); if(x < 0) b = -b; return -powf(sinf(b * PI), 2); @@ -1723,7 +1723,7 @@ FILTER(hp2) FILTER(bp2) { - return (fabs(powf(2, + return (fabsf(powf(2, (1.0f - par) * 7) @@ -1732,7 +1732,7 @@ FILTER(bp2) FILTER(bs2) { - return (fabs(powf(2, + return (fabsf(powf(2, (1.0f - par) * 7) diff --git a/src/Synth/PADnote.cpp b/src/Synth/PADnote.cpp @@ -85,12 +85,12 @@ void PADnote::setup(float freq, //find out the closest note float logfreq = logf(basefreq * powf(2.0f, NoteGlobalPar.Detune / 1200.0f)); - float mindist = fabs(logfreq - logf(pars.sample[0].basefreq + 0.0001f)); + float mindist = fabsf(logfreq - logf(pars.sample[0].basefreq + 0.0001f)); nsample = 0; for(int i = 1; i < PAD_MAX_SAMPLES; ++i) { if(pars.sample[i].smp == NULL) break; - float dist = fabs(logfreq - logf(pars.sample[i].basefreq + 0.0001f)); + float dist = fabsf(logfreq - logf(pars.sample[i].basefreq + 0.0001f)); if(dist < mindist) { nsample = i; diff --git a/src/Synth/SUBnote.cpp b/src/Synth/SUBnote.cpp @@ -35,18 +35,19 @@ namespace zyn { -SUBnote::SUBnote(const SUBnoteParameters *parameters, SynthParams &spars, WatchManager *wm, const char *prefix - ) - :SynthNote(spars), pars(*parameters), +SUBnote::SUBnote(const SUBnoteParameters *parameters, SynthParams &spars, + WatchManager *wm, const char *prefix) : + SynthNote(spars), + watch_filter(wm, prefix, "noteout/filter"), watch_amp_int(wm,prefix,"noteout/amp_int"), + watch_legato(wm, prefix, "noteout/legato"), + pars(*parameters), AmpEnvelope(nullptr), FreqEnvelope(nullptr), BandWidthEnvelope(nullptr), GlobalFilter(nullptr), GlobalFilterEnvelope(nullptr), NoteEnabled(true), - lfilter(nullptr), rfilter(nullptr), - watch_filter(wm, prefix, "noteout/filter"), watch_amp_int(wm,prefix,"noteout/amp_int"), - watch_legato(wm, prefix, "noteout/legato") + lfilter(nullptr), rfilter(nullptr) { setup(spars.frequency, spars.velocity, spars.portamento, spars.note_log2_freq, false, wm, prefix); } diff --git a/src/Synth/SUBnote.h b/src/Synth/SUBnote.h @@ -103,9 +103,7 @@ class SUBnote:public SynthNote float overtone_freq[MAX_SUB_HARMONICS]; int oldpitchwheel, oldbandwidth; - float globalfiltercenterq; float velocity; - WatchManager *wm; }; } diff --git a/src/Tests/MiddlewareTest.h b/src/Tests/MiddlewareTest.h @@ -92,7 +92,7 @@ class PluginTest:public CxxTest::TestSuite float sum = 0.0f; for(int i = 0; i < synth->buffersize; ++i) - sum += fabs(outL[i]); + sum += fabsf(outL[i]); TS_ASSERT_LESS_THAN(0.1f, sum); } diff --git a/src/Tests/PluginTest.h b/src/Tests/PluginTest.h @@ -209,7 +209,7 @@ class PluginTest:public CxxTest::TestSuite float sum = 0.0f; for(int i = 0; i < synth->buffersize; ++i) - sum += fabs(outL[i]); + sum += fabsf(outL[i]); TS_ASSERT_LESS_THAN(0.1f, sum); } diff --git a/src/UI/Fl_OscilSpectrum.h b/src/UI/Fl_OscilSpectrum.h @@ -63,7 +63,7 @@ class Fl_OscilSpectrum : public Fl_Box, public Fl_Osc_Widget //normalize float max=0; for (unsigned i=0; i<nsamples; i++){ - float x=fabs(spc[i]); + float x=fabsf(spc[i]); if (max<x) max=x; } if (max<0.000001) max=1.0; diff --git a/src/UI/Fl_Oscilloscope.h b/src/UI/Fl_Oscilloscope.h @@ -77,8 +77,8 @@ class Fl_Oscilloscope : public Fl_Box, public Fl_Osc_Widget //normalize float max=0; for (int i=0;i<oscilsize;i++) - if(max<fabs(smps[i])) - max=fabs(smps[i]); + if(max<fabsf(smps[i])) + max=fabsf(smps[i]); if (max<0.00001) max=1.0; max *= -1.05; diff --git a/src/UI/Fl_PADnoteOvertonePosition.h b/src/UI/Fl_PADnoteOvertonePosition.h @@ -119,7 +119,7 @@ class PADnoteOvertonePosition: public Fl_Box, public Fl_Osc_Widget //normalize float max=0; for (unsigned i=0; i<nsamples; i++){ - const float x=fabs(data[i]); + const float x=fabsf(data[i]); if (max<x) max=x; } if (max<0.000001) max=1.0; diff --git a/src/globals.h b/src/globals.h @@ -201,8 +201,8 @@ typedef std::complex<fftw_real> fft_t; /* * How the amplitude threshold is computed */ -#define ABOVE_AMPLITUDE_THRESHOLD(a, b) ((2.0f * fabs((b) - (a)) \ - / (fabs((b) + (a) \ +#define ABOVE_AMPLITUDE_THRESHOLD(a, b) ((2.0f * fabsf((b) - (a)) \ + / (fabsf((b) + (a) \ + 0.0000000001f))) > \ AMPLITUDE_INTERPOLATION_THRESHOLD)