Fixed ZamComp led bar graph and whitespace

Signed-off-by: Damien Zammit <damien@zamaudio.com>

1 files changed, 182 insertions, 182 deletions

diff --git a/plugins/ZamComp/ZamCompPlugin.cpp b/plugins/ZamComp/ZamCompPlugin.cpp
index 20e1a31..47f402b 100644
--- a/plugins/ZamComp/ZamCompPlugin.cpp
+++ b/plugins/ZamComp/ZamCompPlugin.cpp
@@ -22,10 +22,10 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamCompPlugin::ZamCompPlugin()
-    : Plugin(paramCount, 3, 0)
+	: Plugin(paramCount, 3, 0)
 {
-    // set default values
-    d_setProgram(0);
+	// set default values
+	d_setProgram(0);
 }
 
 // -----------------------------------------------------------------------
@@ -33,81 +33,81 @@ ZamCompPlugin::ZamCompPlugin()
 
 void ZamCompPlugin::d_initParameter(uint32_t index, Parameter& parameter)
 {
-    switch (index)
-    {
-    case paramAttack:
-        parameter.hints      = kParameterIsAutomable;
-        parameter.name       = "Attack";
-        parameter.symbol     = "att";
-        parameter.unit       = "ms";
-        parameter.ranges.def = 10.0f;
-        parameter.ranges.min = 0.1f;
-        parameter.ranges.max = 200.0f;
-        break;
-    case paramRelease:
-        parameter.hints      = kParameterIsAutomable;
-        parameter.name       = "Release";
-        parameter.symbol     = "rel";
-        parameter.unit       = "ms";
-        parameter.ranges.def = 80.0f;
-        parameter.ranges.min = 50.0f;
-        parameter.ranges.max = 500.0f;
-        break;
-    case paramKnee:
-        parameter.hints      = kParameterIsAutomable;
-        parameter.name       = "Knee";
-        parameter.symbol     = "kn";
-        parameter.unit       = "dB";
-        parameter.ranges.def = 0.0f;
-        parameter.ranges.min = 0.0f;
-        parameter.ranges.max = 8.0f;
-        break;
-    case paramRatio:
-        parameter.hints      = kParameterIsAutomable;
-        parameter.name       = "Ratio";
-        parameter.symbol     = "rat";
-        parameter.unit       = " ";
-        parameter.ranges.def = 4.0f;
-        parameter.ranges.min = 1.0f;
-        parameter.ranges.max = 20.0f;
-        break;
-    case paramThresh:
-        parameter.hints      = kParameterIsAutomable;
-        parameter.name       = "Threshold";
-        parameter.symbol     = "thr";
-        parameter.unit       = "dB";
-        parameter.ranges.def = 0.0f;
-        parameter.ranges.min = -60.0f;
-        parameter.ranges.max = 0.0f;
-        break;
-    case paramMakeup:
-        parameter.hints      = kParameterIsAutomable;
-        parameter.name       = "Makeup";
-        parameter.symbol     = "mak";
-        parameter.unit       = "dB";
-        parameter.ranges.def = 0.0f;
-        parameter.ranges.min = -30.0f;
-        parameter.ranges.max = 30.0f;
-        break;
-    case paramGainR:
-        parameter.hints      = kParameterIsOutput;
-        parameter.name       = "Gain Reduction";
-        parameter.symbol     = "gr";
-        parameter.unit       = "dB";
-        parameter.ranges.def = 0.0f;
-        parameter.ranges.min = 0.0f;
-        parameter.ranges.max = 40.0f;
-        break;
-    case paramOutputLevel:
-        parameter.hints      = kParameterIsOutput;
-        parameter.name       = "Output Level";
-        parameter.symbol     = "outlevel";
-        parameter.unit       = "dB";
-        parameter.ranges.def = -45.0f;
-        parameter.ranges.min = -45.0f;
-        parameter.ranges.max = 20.0f;
-        break;
-    }
+	switch (index)
+	{
+	case paramAttack:
+	parameter.hints	  = kParameterIsAutomable;
+	parameter.name	   = "Attack";
+	parameter.symbol	 = "att";
+	parameter.unit	   = "ms";
+	parameter.ranges.def = 10.0f;
+	parameter.ranges.min = 0.1f;
+	parameter.ranges.max = 200.0f;
+	break;
+	case paramRelease:
+	parameter.hints	  = kParameterIsAutomable;
+	parameter.name	   = "Release";
+	parameter.symbol	 = "rel";
+	parameter.unit	   = "ms";
+	parameter.ranges.def = 80.0f;
+	parameter.ranges.min = 50.0f;
+	parameter.ranges.max = 500.0f;
+	break;
+	case paramKnee:
+	parameter.hints	  = kParameterIsAutomable;
+	parameter.name	   = "Knee";
+	parameter.symbol	 = "kn";
+	parameter.unit	   = "dB";
+	parameter.ranges.def = 0.0f;
+	parameter.ranges.min = 0.0f;
+	parameter.ranges.max = 8.0f;
+	break;
+	case paramRatio:
+	parameter.hints	  = kParameterIsAutomable;
+	parameter.name	   = "Ratio";
+	parameter.symbol	 = "rat";
+	parameter.unit	   = " ";
+	parameter.ranges.def = 4.0f;
+	parameter.ranges.min = 1.0f;
+	parameter.ranges.max = 20.0f;
+	break;
+	case paramThresh:
+	parameter.hints	  = kParameterIsAutomable;
+	parameter.name	   = "Threshold";
+	parameter.symbol	 = "thr";
+	parameter.unit	   = "dB";
+	parameter.ranges.def = 0.0f;
+	parameter.ranges.min = -60.0f;
+	parameter.ranges.max = 0.0f;
+	break;
+	case paramMakeup:
+	parameter.hints	  = kParameterIsAutomable;
+	parameter.name	   = "Makeup";
+	parameter.symbol	 = "mak";
+	parameter.unit	   = "dB";
+	parameter.ranges.def = 0.0f;
+	parameter.ranges.min = -30.0f;
+	parameter.ranges.max = 30.0f;
+	break;
+	case paramGainR:
+	parameter.hints	  = kParameterIsOutput;
+	parameter.name	   = "Gain Reduction";
+	parameter.symbol	 = "gr";
+	parameter.unit	   = "dB";
+	parameter.ranges.def = 0.0f;
+	parameter.ranges.min = 0.0f;
+	parameter.ranges.max = 40.0f;
+	break;
+	case paramOutputLevel:
+	parameter.hints	  = kParameterIsOutput;
+	parameter.name	   = "Output Level";
+	parameter.symbol	 = "outlevel";
+	parameter.unit	   = "dB";
+	parameter.ranges.def = -45.0f;
+	parameter.ranges.min = -45.0f;
+	parameter.ranges.max = 20.0f;
+	break;
+	}
 }
 
 void ZamCompPlugin::d_initProgramName(uint32_t index, d_string& programName)
@@ -166,75 +166,74 @@ void ZamCompPlugin::loadProgram(uint32_t index)
 
 float ZamCompPlugin::d_getParameterValue(uint32_t index) const
 {
-    switch (index)
-    {
-    case paramAttack:
-        return attack;
-        break;
-    case paramRelease:
-        return release;
-        break;
-    case paramKnee:
-        return knee;
-        break;
-    case paramRatio:
-        return ratio;
-        break;
-    case paramThresh:
-        return thresdb;
-        break;
-    case paramMakeup:
-        return makeup;
-        break;
-    case paramGainR:
-        return gainr;
-        break;
-    case paramOutputLevel:
-        return outlevel;
-        break;
-    default:
-        return 0.0f;
-    }
+	switch (index)
+	{
+	case paramAttack:
+	return attack;
+	break;
+	case paramRelease:
+	return release;
+	break;
+	case paramKnee:
+	return knee;
+	break;
+	case paramRatio:
+	return ratio;
+	break;
+	case paramThresh:
+	return thresdb;
+	break;
+	case paramMakeup:
+	return makeup;
+	break;
+	case paramGainR:
+	return gainr;
+	break;
+	case paramOutputLevel:
+	return outlevel;
+	break;
+	default:
+	return 0.0f;
+	}
 }
 
 void ZamCompPlugin::d_setParameterValue(uint32_t index, float value)
 {
-    switch (index)
-    {
-    case paramAttack:
-        attack = value;
-        break;
-    case paramRelease:
-        release = value;
-        break;
-    case paramKnee:
-        knee = value;
-        break;
-    case paramRatio:
-        ratio = value;
-        break;
-    case paramThresh:
-        thresdb = value;
-        break;
-    case paramMakeup:
-        makeup = value;
-        break;
-    case paramGainR:
-        gainr = value;
-        break;
-    case paramOutputLevel:
-        outlevel = value;
-        break;
-    }
+	switch (index) {
+	case paramAttack:
+		attack = value;
+		break;
+	case paramRelease:
+		release = value;
+		break;
+	case paramKnee:
+		knee = value;
+		break;
+	case paramRatio:
+		ratio = value;
+		break;
+	case paramThresh:
+		thresdb = value;
+		break;
+	case paramMakeup:
+		makeup = value;
+		break;
+	case paramGainR:
+		gainr = value;
+		break;
+	case paramOutputLevel:
+		outlevel = value;
+		break;
+	}
 }
 
 void ZamCompPlugin::d_setProgram(uint32_t index)
 {
-    /* Default parameter values */
-    loadProgram(index);
+	/* Default parameter values */
+	loadProgram(index);
 
-    /* reset filter values */
-    d_activate();
+	/* reset filter values */
+	d_activate();
 }
 
 // -----------------------------------------------------------------------
@@ -242,83 +241,84 @@ void ZamCompPlugin::d_setProgram(uint32_t index)
 
 void ZamCompPlugin::d_activate()
 {
-    gainr = 0.0f;
-    outlevel = -45.f;
-    old_yl = old_y1 = old_yg = 0.0f;
+	gainr = 0.0f;
+	outlevel = -45.f;
+	old_yl = old_y1 = old_yg = 0.0f;
 }
 
 void ZamCompPlugin::d_run(const float** inputs, float** outputs, uint32_t frames)
 {
 	float srate = d_getSampleRate();
-        float width=(knee-0.99f)*6.f;
-        float cdb=0.f;
-        float attack_coeff = exp(-1000.f/(attack * srate));
-        float release_coeff = exp(-1000.f/(release * srate));
+	float width=(knee-0.99f)*6.f;
+	float cdb=0.f;
+	float attack_coeff = exp(-1000.f/(attack * srate));
+	float release_coeff = exp(-1000.f/(release * srate));
 	int slew;
 	float slewfactor = 1.f + knee/2.f;
-        float gain = 1.f;
-        float xg, xl, yg, yl, y1;
-        uint32_t i;
+	float gain = 1.f;
+	float gaininp = 0.f;
+	float xg, xl, yg, yl, y1;
+	uint32_t i;
 	float max = 0.f;
 
-        for (i = 0; i < frames; i++) {
-                yg=0.f;
+	for (i = 0; i < frames; i++) {
+		yg=0.f;
 		slew = 0;
-                xg = (inputs[0][i]==0.f) ? -160.f : to_dB(fabs(inputs[0][i]));
-                xg = sanitize_denormal(xg);
+		xg = (inputs[0][i]==0.f) ? -160.f : to_dB(fabs(inputs[0][i]));
+		xg = sanitize_denormal(xg);
 
 		yg = xg + (1.f/ratio-1.f)*(xg-thresdb+width/2.f)*(xg-thresdb+width/2.f)/(2.f*width);
-                yg = sanitize_denormal(yg);
+		yg = sanitize_denormal(yg);
 
-                if (2.f*(xg-thresdb)<-width) {
-                        // before the knee
+		if (2.f*(xg-thresdb)<-width) {
+			// before the knee
 			yg = xg;
-                } else if (2.f*fabs(xg-thresdb)<=width && yg >= old_yg) {
-                        // inside the knee from below
+		} else if (2.f*fabs(xg-thresdb)<=width && yg >= old_yg) {
+			// inside the knee from below
 			// NOOP
 			slew = 1;
-                } else if (2.f*fabs(xg-thresdb)<=width && yg < old_yg) {
-                        // inside the knee dropping off
+		} else if (2.f*fabs(xg-thresdb)<=width && yg < old_yg) {
+			// inside the knee dropping off
 			yg = thresdb + (xg-thresdb)/ratio;
-                	yg = sanitize_denormal(yg);
-                } else if (2.f*(xg-thresdb)>width) {
+			yg = sanitize_denormal(yg);
+		} else if (2.f*(xg-thresdb)>width) {
 			// after the knee
-                        yg = thresdb + (xg-thresdb)/ratio;
-                	yg = sanitize_denormal(yg);
-                }
+			yg = thresdb + (xg-thresdb)/ratio;
+			yg = sanitize_denormal(yg);
+		}
 
-                xl = xg - yg;
-                old_y1 = sanitize_denormal(old_y1);
-                old_yl = sanitize_denormal(old_yl);
+		xl = xg - yg;
+		old_y1 = sanitize_denormal(old_y1);
+		old_yl = sanitize_denormal(old_yl);
 
-                y1 = fmaxf(xl, release_coeff * old_y1+(1.f-release_coeff)*xl);
-                attack_coeff = slew ? exp(-1000.f/(attack*slewfactor * srate)) : attack_coeff;
+		y1 = fmaxf(xl, release_coeff * old_y1+(1.f-release_coeff)*xl);
+		attack_coeff = slew ? exp(-1000.f/(attack*slewfactor * srate)) : attack_coeff;
 		yl = attack_coeff * old_yl+(1.f-attack_coeff)*y1;
-                y1 = sanitize_denormal(y1);
-                yl = sanitize_denormal(yl);
+		y1 = sanitize_denormal(y1);
+		yl = sanitize_denormal(yl);
 
 		cdb = -yl;
-                gain = from_dB(cdb);
+		gain = from_dB(cdb);
 
-                gainr = yl;
+		gainr = yl;
 
-                outputs[0][i] = inputs[0][i];
-                outputs[0][i] *= gain * from_dB(makeup);
+		gaininp = inputs[0][i] * gain;
+		outputs[0][i] = gaininp * from_dB(makeup);
 
-		max = (fabsf(outputs[0][i]) > max) ? fabsf(outputs[0][i]) : sanitize_denormal(max);
+		max = (fabsf(gaininp) > max) ? fabsf(gaininp) : sanitize_denormal(max);
 
-                old_yl = yl;
-                old_y1 = y1;
+		old_yl = yl;
+		old_y1 = y1;
 		old_yg = yg;
-        }
-	outlevel = (max == 0.f) ? -45.f : to_dB(max);
-    }
+	}
+	outlevel = (max == 0.f) ? -45.f : to_dB(max) - thresdb;
+}
 
 // -----------------------------------------------------------------------
 
 Plugin* createPlugin()
 {
-    return new ZamCompPlugin();
+	return new ZamCompPlugin();
 }
 
 // -----------------------------------------------------------------------