aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/MacAU/GuitarConditioner/GuitarConditioner.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/MacAU/GuitarConditioner/GuitarConditioner.cpp')
-rwxr-xr-xplugins/MacAU/GuitarConditioner/GuitarConditioner.cpp25
1 files changed, 7 insertions, 18 deletions
diff --git a/plugins/MacAU/GuitarConditioner/GuitarConditioner.cpp b/plugins/MacAU/GuitarConditioner/GuitarConditioner.cpp
index 232fd21..d3d23e6 100755
--- a/plugins/MacAU/GuitarConditioner/GuitarConditioner.cpp
+++ b/plugins/MacAU/GuitarConditioner/GuitarConditioner.cpp
@@ -150,8 +150,7 @@ ComponentResult GuitarConditioner::Initialize()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
void GuitarConditioner::GuitarConditionerKernel::Reset()
{
- fpNShapeA = 0.0;
- fpNShapeB = 0.0;
+ fpNShape = 0.0;
fpFlip = true;
lastSampleT = 0.0;
lastSampleB = 0.0; //for Slews. T for treble, B for bass
@@ -176,9 +175,6 @@ void GuitarConditioner::GuitarConditionerKernel::Process( const Float32 *inSou
long double overallscale = 1.0;
overallscale /= 44100.0;
overallscale *= GetSampleRate();
- Float32 fpTemp;
- long double fpOld = 0.618033988749894848204586; //golden ratio!
- long double fpNew = 1.0 - fpOld;
long double inputSample;
long double treble;
long double bass;
@@ -264,21 +260,14 @@ void GuitarConditioner::GuitarConditionerKernel::Process( const Float32 *inSou
lastSampleB = bass; //bass slew
inputSample = treble + bass; //final merge
+ fpFlip = !fpFlip;
+ //32 bit dither, made small and tidy.
+ int expon; frexpf((Float32)inputSample, &expon);
+ long double dither = (rand()/(RAND_MAX*7.737125245533627e+25))*pow(2,expon+62);
+ inputSample += (dither-fpNShape); fpNShape = dither;
+ //end 32 bit dither
- //noise shaping to 32-bit floating point
- if (fpFlip) {
- fpTemp = inputSample;
- fpNShapeA = (fpNShapeA*fpOld)+((inputSample-fpTemp)*fpNew);
- inputSample += fpNShapeA;
- }
- else {
- fpTemp = inputSample;
- fpNShapeB = (fpNShapeB*fpOld)+((inputSample-fpTemp)*fpNew);
- inputSample += fpNShapeB;
- }
- fpFlip = not fpFlip;
- //end noise shaping on 32 bit output
*destP = inputSample;
sourceP += inNumChannels; destP += inNumChannels;
}