commit 0999dda74d419fb97bf0d4474d8f3d5abf977570
parent 7d5373494d1d84d6cdfe32d50d781f462a889bc7
Author: fundamental <mark.d.mccurry@gmail.com>
Date: Sun, 21 Aug 2011 14:49:13 -0400
Style: Matching up get/set params on effects
Diffstat:
7 files changed, 300 insertions(+), 454 deletions(-)
diff --git a/src/Effects/Alienwah.cpp b/src/Effects/Alienwah.cpp
@@ -198,84 +198,60 @@ void Alienwah::setpreset(unsigned char npreset)
void Alienwah::changepar(int npar, unsigned char value)
{
switch(npar) {
- case 0:
- setvolume(value);
- break;
- case 1:
- setpanning(value);
- break;
- case 2:
- lfo.Pfreq = value;
- lfo.updateparams();
- break;
- case 3:
- lfo.Prandomness = value;
- lfo.updateparams();
- break;
- case 4:
- lfo.PLFOtype = value;
- lfo.updateparams();
- break;
- case 5:
- lfo.Pstereo = value;
- lfo.updateparams();
- break;
- case 6:
- setdepth(value);
- break;
- case 7:
- setfb(value);
- break;
- case 8:
- setdelay(value);
- break;
- case 9:
- setlrcross(value);
- break;
- case 10:
- setphase(value);
- break;
+ case 0:
+ setvolume(value);
+ break;
+ case 1:
+ setpanning(value);
+ break;
+ case 2:
+ lfo.Pfreq = value;
+ lfo.updateparams();
+ break;
+ case 3:
+ lfo.Prandomness = value;
+ lfo.updateparams();
+ break;
+ case 4:
+ lfo.PLFOtype = value;
+ lfo.updateparams();
+ break;
+ case 5:
+ lfo.Pstereo = value;
+ lfo.updateparams();
+ break;
+ case 6:
+ setdepth(value);
+ break;
+ case 7:
+ setfb(value);
+ break;
+ case 8:
+ setdelay(value);
+ break;
+ case 9:
+ setlrcross(value);
+ break;
+ case 10:
+ setphase(value);
+ break;
}
}
unsigned char Alienwah::getpar(int npar) const
{
switch(npar) {
- case 0:
- return Pvolume;
- break;
- case 1:
- return Ppanning;
- break;
- case 2:
- return lfo.Pfreq;
- break;
- case 3:
- return lfo.Prandomness;
- break;
- case 4:
- return lfo.PLFOtype;
- break;
- case 5:
- return lfo.Pstereo;
- break;
- case 6:
- return Pdepth;
- break;
- case 7:
- return Pfb;
- break;
- case 8:
- return Pdelay;
- break;
- case 9:
- return Plrcross;
- break;
- case 10:
- return Pphase;
- break;
- default:
- return 0;
+ case 0: return Pvolume;
+ case 1: return Ppanning;
+ case 2: return lfo.Pfreq;
+ case 3: return lfo.Prandomness;
+ case 4: return lfo.PLFOtype;
+ case 5: return lfo.Pstereo;
+ case 6: return Pdepth;
+ case 7: return Pfb;
+ case 8: return Pdelay;
+ case 9: return Plrcross;
+ case 10: return Pphase;
+ default: return 0;
}
}
-
diff --git a/src/Effects/Chorus.cpp b/src/Effects/Chorus.cpp
@@ -223,96 +223,65 @@ void Chorus::setpreset(unsigned char npreset)
void Chorus::changepar(int npar, unsigned char value)
{
switch(npar) {
- case 0:
- setvolume(value);
- break;
- case 1:
- setpanning(value);
- break;
- case 2:
- lfo.Pfreq = value;
- lfo.updateparams();
- break;
- case 3:
- lfo.Prandomness = value;
- lfo.updateparams();
- break;
- case 4:
- lfo.PLFOtype = value;
- lfo.updateparams();
- break;
- case 5:
- lfo.Pstereo = value;
- lfo.updateparams();
- break;
- case 6:
- setdepth(value);
- break;
- case 7:
- setdelay(value);
- break;
- case 8:
- setfb(value);
- break;
- case 9:
- setlrcross(value);
- break;
- case 10:
- if(value > 1)
- Pflangemode = 1;
- else
- Pflangemode = value;
- break;
- case 11:
- if(value > 1)
- Poutsub = 1;
- else
- Poutsub = value;
- break;
+ case 0:
+ setvolume(value);
+ break;
+ case 1:
+ setpanning(value);
+ break;
+ case 2:
+ lfo.Pfreq = value;
+ lfo.updateparams();
+ break;
+ case 3:
+ lfo.Prandomness = value;
+ lfo.updateparams();
+ break;
+ case 4:
+ lfo.PLFOtype = value;
+ lfo.updateparams();
+ break;
+ case 5:
+ lfo.Pstereo = value;
+ lfo.updateparams();
+ break;
+ case 6:
+ setdepth(value);
+ break;
+ case 7:
+ setdelay(value);
+ break;
+ case 8:
+ setfb(value);
+ break;
+ case 9:
+ setlrcross(value);
+ break;
+ case 10:
+ Pflangemode = (value > 1) ? 1 : value;
+ break;
+ case 11:
+ Poutsub = (value > 1) ? 1 : value;
+ break;
}
}
unsigned char Chorus::getpar(int npar) const
{
switch(npar) {
- case 0:
- return Pvolume;
- break;
- case 1:
- return Ppanning;
- break;
- case 2:
- return lfo.Pfreq;
- break;
- case 3:
- return lfo.Prandomness;
- break;
- case 4:
- return lfo.PLFOtype;
- break;
- case 5:
- return lfo.Pstereo;
- break;
- case 6:
- return Pdepth;
- break;
- case 7:
- return Pdelay;
- break;
- case 8:
- return Pfb;
- break;
- case 9:
- return Plrcross;
- break;
- case 10:
- return Pflangemode;
- break;
- case 11:
- return Poutsub;
- break;
- default:
- return 0;
+ case 0: return Pvolume;
+ case 1: return Ppanning;
+ case 2: return lfo.Pfreq;
+ case 3: return lfo.Prandomness;
+ case 4: return lfo.PLFOtype;
+ case 5: return lfo.Pstereo;
+ case 6: return Pdepth;
+ case 7: return Pdelay;
+ case 8: return Pfb;
+ case 9: return Plrcross;
+ case 10: return Pflangemode;
+ case 11: return Poutsub;
+ default: return 0;
}
}
diff --git a/src/Effects/Distorsion.cpp b/src/Effects/Distorsion.cpp
@@ -224,88 +224,63 @@ void Distorsion::setpreset(unsigned char npreset)
void Distorsion::changepar(int npar, unsigned char value)
{
switch(npar) {
- case 0:
- setvolume(value);
- break;
- case 1:
- setpanning(value);
- break;
- case 2:
- setlrcross(value);
- break;
- case 3:
- Pdrive = value;
- break;
- case 4:
- Plevel = value;
- break;
- case 5:
- if(value > 13)
- Ptype = 13; //this must be increased if more distorsion types are added
- else
- Ptype = value;
- break;
- case 6:
- if(value > 1)
- Pnegate = 1;
- else
- Pnegate = value;
- break;
- case 7:
- setlpf(value);
- break;
- case 8:
- sethpf(value);
- break;
- case 9:
- if(value > 1)
- Pstereo = 1;
- else
- Pstereo = value;
- break;
- case 10:
- Pprefiltering = value;
- break;
+ case 0:
+ setvolume(value);
+ break;
+ case 1:
+ setpanning(value);
+ break;
+ case 2:
+ setlrcross(value);
+ break;
+ case 3:
+ Pdrive = value;
+ break;
+ case 4:
+ Plevel = value;
+ break;
+ case 5:
+ if(value > 13)
+ Ptype = 13; //this must be increased if more distorsion types are added
+ else
+ Ptype = value;
+ break;
+ case 6:
+ if(value > 1)
+ Pnegate = 1;
+ else
+ Pnegate = value;
+ break;
+ case 7:
+ setlpf(value);
+ break;
+ case 8:
+ sethpf(value);
+ break;
+ case 9:
+ Pstereo = (value > 1) ? 1 : value;
+ break;
+ case 10:
+ Pprefiltering = value;
+ break;
}
}
unsigned char Distorsion::getpar(int npar) const
{
switch(npar) {
- case 0:
- return Pvolume;
- break;
- case 1:
- return Ppanning;
- break;
- case 2:
- return Plrcross;
- break;
- case 3:
- return Pdrive;
- break;
- case 4:
- return Plevel;
- break;
- case 5:
- return Ptype;
- break;
- case 6:
- return Pnegate;
- break;
- case 7:
- return Plpf;
- break;
- case 8:
- return Phpf;
- break;
- case 9:
- return Pstereo;
- break;
- case 10:
- return Pprefiltering;
- break;
+ case 0: return Pvolume;
+ case 1: return Ppanning;
+ case 2: return Plrcross;
+ case 3: return Pdrive;
+ case 4: return Plevel;
+ case 5: return Ptype;
+ case 6: return Pnegate;
+ case 7: return Plpf;
+ case 8: return Phpf;
+ case 9: return Pstereo;
+ case 10: return Pprefiltering;
+ default: return 0;
}
- return 0; //in case of bogus parameter number
}
diff --git a/src/Effects/DynamicFilter.cpp b/src/Effects/DynamicFilter.cpp
@@ -272,80 +272,59 @@ void DynamicFilter::setpreset(unsigned char npreset)
void DynamicFilter::changepar(int npar, unsigned char value)
{
switch(npar) {
- case 0:
- setvolume(value);
- break;
- case 1:
- setpanning(value);
- break;
- case 2:
- lfo.Pfreq = value;
- lfo.updateparams();
- break;
- case 3:
- lfo.Prandomness = value;
- lfo.updateparams();
- break;
- case 4:
- lfo.PLFOtype = value;
- lfo.updateparams();
- break;
- case 5:
- lfo.Pstereo = value;
- lfo.updateparams();
- break;
- case 6:
- setdepth(value);
- break;
- case 7:
- setampsns(value);
- break;
- case 8:
- Pampsnsinv = value;
- setampsns(Pampsns);
- break;
- case 9:
- Pampsmooth = value;
- setampsns(Pampsns);
- break;
+ case 0:
+ setvolume(value);
+ break;
+ case 1:
+ setpanning(value);
+ break;
+ case 2:
+ lfo.Pfreq = value;
+ lfo.updateparams();
+ break;
+ case 3:
+ lfo.Prandomness = value;
+ lfo.updateparams();
+ break;
+ case 4:
+ lfo.PLFOtype = value;
+ lfo.updateparams();
+ break;
+ case 5:
+ lfo.Pstereo = value;
+ lfo.updateparams();
+ break;
+ case 6:
+ setdepth(value);
+ break;
+ case 7:
+ setampsns(value);
+ break;
+ case 8:
+ Pampsnsinv = value;
+ setampsns(Pampsns);
+ break;
+ case 9:
+ Pampsmooth = value;
+ setampsns(Pampsns);
+ break;
}
}
unsigned char DynamicFilter::getpar(int npar) const
{
switch(npar) {
- case 0:
- return Pvolume;
- break;
- case 1:
- return Ppanning;
- break;
- case 2:
- return lfo.Pfreq;
- break;
- case 3:
- return lfo.Prandomness;
- break;
- case 4:
- return lfo.PLFOtype;
- break;
- case 5:
- return lfo.Pstereo;
- break;
- case 6:
- return Pdepth;
- break;
- case 7:
- return Pampsns;
- break;
- case 8:
- return Pampsnsinv;
- break;
- case 9:
- return Pampsmooth;
- break;
- default:
- return 0;
+ case 0: return Pvolume;
+ case 1: return Ppanning;
+ case 2: return lfo.Pfreq;
+ case 3: return lfo.Prandomness;
+ case 4: return lfo.PLFOtype;
+ case 5: return lfo.Pstereo;
+ case 6: return Pdepth;
+ case 7: return Pampsns;
+ case 8: return Pampsnsinv;
+ case 9: return Pampsmooth;
+ default: return 0;
}
}
diff --git a/src/Effects/Echo.cpp b/src/Effects/Echo.cpp
@@ -215,55 +215,41 @@ void Echo::setpreset(unsigned char npreset)
void Echo::changepar(int npar, unsigned char value)
{
switch(npar) {
- case 0:
- setvolume(value);
- break;
- case 1:
- setpanning(value);
- break;
- case 2:
- setdelay(value);
- break;
- case 3:
- setlrdelay(value);
- break;
- case 4:
- setlrcross(value);
- break;
- case 5:
- setfb(value);
- break;
- case 6:
- sethidamp(value);
- break;
+ case 0:
+ setvolume(value);
+ break;
+ case 1:
+ setpanning(value);
+ break;
+ case 2:
+ setdelay(value);
+ break;
+ case 3:
+ setlrdelay(value);
+ break;
+ case 4:
+ setlrcross(value);
+ break;
+ case 5:
+ setfb(value);
+ break;
+ case 6:
+ sethidamp(value);
+ break;
}
}
unsigned char Echo::getpar(int npar) const
{
switch(npar) {
- case 0:
- return Pvolume;
- break;
- case 1:
- return Ppanning;
- break;
- case 2:
- return Pdelay;
- break;
- case 3:
- return Plrdelay;
- break;
- case 4:
- return Plrcross;
- break;
- case 5:
- return Pfb;
- break;
- case 6:
- return Phidamp;
- break;
+ case 0: return Pvolume;
+ case 1: return Ppanning;
+ case 2: return Pdelay;
+ case 3: return Plrdelay;
+ case 4: return Plrcross;
+ case 5: return Pfb;
+ case 6: return Phidamp;
+ default: return 0;
}
return 0; // in case of bogus parameter number
}
-
diff --git a/src/Effects/Phaser.cpp b/src/Effects/Phaser.cpp
@@ -435,39 +435,23 @@ void Phaser::changepar(int npar, unsigned char value)
unsigned char Phaser::getpar(int npar) const
{
switch(npar) {
- case 0:
- return Pvolume;
- case 1:
- return Ppanning;
- case 2:
- return lfo.Pfreq;
- case 3:
- return lfo.Prandomness;
- case 4:
- return lfo.PLFOtype;
- case 5:
- return lfo.Pstereo;
- case 6:
- return Pdepth;
- case 7:
- return Pfb;
- case 8:
- return Pstages;
- case 9:
- return Plrcross;
- return Poffset;
- case 10:
- return Poutsub;
- case 11:
- return Pphase;
- return Pwidth;
- case 12:
- return Phyper;
- case 13:
- return Pdistortion;
- case 14:
- return Panalog;
- default:
- return 0;
+ case 0: return Pvolume;
+ case 1: return Ppanning;
+ case 2: return lfo.Pfreq;
+ case 3: return lfo.Prandomness;
+ case 4: return lfo.PLFOtype;
+ case 5: return lfo.Pstereo;
+ case 6: return Pdepth;
+ case 7: return Pfb;
+ case 8: return Pstages;
+ case 9: return Plrcross;
+ return Poffset; //same
+ case 10: return Poutsub;
+ case 11: return Pphase;
+ return Pwidth; //same
+ case 12: return Phyper;
+ case 13: return Pdistortion;
+ case 14: return Panalog;
+ default: return 0;
}
}
diff --git a/src/Effects/Reverb.cpp b/src/Effects/Reverb.cpp
@@ -459,87 +459,64 @@ void Reverb::setpreset(unsigned char npreset)
void Reverb::changepar(int npar, unsigned char value)
{
switch(npar) {
- case 0:
- setvolume(value);
- break;
- case 1:
- setpan(value);
- break;
- case 2:
- settime(value);
- break;
- case 3:
- setidelay(value);
- break;
- case 4:
- setidelayfb(value);
- break;
-// case 5: setrdelay(value);
-// break;
-// case 6: seterbalance(value);
-// break;
- case 7:
- setlpf(value);
- break;
- case 8:
- sethpf(value);
- break;
- case 9:
- setlohidamp(value);
- break;
- case 10:
- settype(value);
- break;
- case 11:
- setroomsize(value);
- break;
- case 12:
- setbandwidth(value);
- break;
+ case 0:
+ setvolume(value);
+ break;
+ case 1:
+ setpan(value);
+ break;
+ case 2:
+ settime(value);
+ break;
+ case 3:
+ setidelay(value);
+ break;
+ case 4:
+ setidelayfb(value);
+ break;
+// case 5:
+// setrdelay(value);
+// break;
+// case 6:
+// seterbalance(value);
+// break;
+ case 7:
+ setlpf(value);
+ break;
+ case 8:
+ sethpf(value);
+ break;
+ case 9:
+ setlohidamp(value);
+ break;
+ case 10:
+ settype(value);
+ break;
+ case 11:
+ setroomsize(value);
+ break;
+ case 12:
+ setbandwidth(value);
+ break;
}
}
unsigned char Reverb::getpar(int npar) const
{
switch(npar) {
- case 0:
- return Pvolume;
- break;
- case 1:
- return Ppan;
- break;
- case 2:
- return Ptime;
- break;
- case 3:
- return Pidelay;
- break;
- case 4:
- return Pidelayfb;
- break;
-// case 5: return(Prdelay);
-// break;
-// case 6: return(Perbalance);
-// break;
- case 7:
- return Plpf;
- break;
- case 8:
- return Phpf;
- break;
- case 9:
- return Plohidamp;
- break;
- case 10:
- return Ptype;
- break;
- case 11:
- return Proomsize;
- break;
- case 12:
- return Pbandwidth;
- break;
+ case 0: return Pvolume;
+ case 1: return Ppan;
+ case 2: return Ptime;
+ case 3: return Pidelay;
+ case 4: return Pidelayfb;
+// case 5: return Prdelay;
+// case 6: return Perbalance;
+ case 7: return Plpf;
+ case 8: return Phpf;
+ case 9: return Plohidamp;
+ case 10: return Ptype;
+ case 11: return Proomsize;
+ case 12: return Pbandwidth;
+ default: return 0;
}
- return 0; //in case of bogus "parameter"
}
-
