rename Envelope to ADEnvelope

Author: alefnull

src/Envelope.hpp

@@ -6,7 +6,7 @@
 #define MIN_VALUE 0.001f
 
 
-struct Envelope {
+struct ADEnvelope {
     enum Stage {
         IDLE,
         RISING,
@@ -31,7 +31,7 @@ struct Envelope {
     float sampleTime = 0;
     int processCount = 0;
 
-    Envelope() {}
+    ADEnvelope() {}
 
     void set_rise(float rise_time) {
         this->rise_time = clamp(rise_time, 0.01f, 10.f);
@@ -64,10 +64,11 @@ struct Envelope {
     }
     void process(float st) {
     	processCount++;
-    	sampleTime+=st;
-    	if(processCount < 64){
+    	sampleTime += st;
+    	if (processCount < 64) {
     		return;
-    	}else{
+    	}
+        else {
     		processCount = 0;
     		st = sampleTime;
     		sampleTime = 0;
@@ -127,8 +128,10 @@ struct Envelope {
                 }
                 break;
         }
-        _env = clamp(_env,MIN_VALUE,MAX_VALUE);
-        // env = _env * ENV_MAX_VALUE;
+        _env = clamp(_env, MIN_VALUE, MAX_VALUE);
+        env = _env;
+    }
+};
         env = _env;
     }
 };

src/funcgen.cpp

@@ -92,8 +92,8 @@ struct Funcgen : Module {
 	int shuffle_index = 0; //when in shuffle mode, stores which shuffle index is being played next
 
 	Mode mode = EACH;
-	Envelope envelope[CHANNEL_COUNT];
-	Envelope cm_envelope;
+	ADEnvelope envelope[CHANNEL_COUNT];
+	ADEnvelope cm_envelope;
 	dsp::SchmittTrigger trigger[CHANNEL_COUNT];
 	dsp::SchmittTrigger push[CHANNEL_COUNT];
 	dsp::SchmittTrigger cascade_trigger;
@@ -232,8 +232,8 @@ struct Funcgen : Module {
 				outputs[FUNCTION_OUTPUT + i].setVoltage(range[i] * 2 * (envelope[i].env - 0.5f));
 			}
 
-			outputs[RISING_OUTPUT + i].setVoltage(envelope[i].stage == Envelope::RISING ? 10.f : 0.f);
-			outputs[FALLING_OUTPUT + i].setVoltage(envelope[i].stage == Envelope::FALLING ? 10.f : 0.f);
+			outputs[RISING_OUTPUT + i].setVoltage(envelope[i].stage == ADEnvelope::RISING ? 10.f : 0.f);
+			outputs[FALLING_OUTPUT + i].setVoltage(envelope[i].stage == ADEnvelope::FALLING ? 10.f : 0.f);
 		}
 
 		if (cm_loop_trigger.process(params[CASCADE_LOOP_PARAM].getValue())) {
@@ -261,8 +261,8 @@ struct Funcgen : Module {
 		else {
 			outputs[CASCADE_OUTPUT].setVoltage(range_cascade * 2 * (cascade_output - 0.5f));
 		}
-		outputs[CASCADE_RISING_OUTPUT].setVoltage(cm_envelope.stage == Envelope::RISING ? 10.f : 0.f);
-		outputs[CASCADE_FALLING_OUTPUT].setVoltage(cm_envelope.stage == Envelope::FALLING ? 10.f : 0.f);
+		outputs[CASCADE_RISING_OUTPUT].setVoltage(cm_envelope.stage == ADEnvelope::RISING ? 10.f : 0.f);
+		outputs[CASCADE_FALLING_OUTPUT].setVoltage(cm_envelope.stage == ADEnvelope::FALLING ? 10.f : 0.f);
 
 		if (cascade_trigger.process(inputs[CASCADE_TRIGGER_INPUT].getVoltage())) {
 			start_cycle();

src/supersaw.cpp

@@ -48,7 +48,7 @@ struct Supersaw : Module {
 	Oscillator osc2[MAX_POLY];
 	Oscillator osc3[MAX_POLY];
 	Oscillator osc4[MAX_POLY];
-	Envelope envelope;
+	ADEnvelope envelope;
 	dsp::SchmittTrigger trigger;
 	float noise_dur = 0.f;
 	float noise_mix = 0.f;