- made dynamics.envelope_follower support polyphony

christophhart · Sep 15, 2024 · 37a13ea · 37a13ea
1 parent f17ab75
commit 37a13ea
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 40 deletions.
diff --git a/hi_backend/backend/BackendVisualizer.cpp b/hi_backend/backend/BackendVisualizer.cpp
@@ -1835,7 +1835,7 @@ void MainTopBar::ClickablePeakMeter::PopupComponent::EnvInfo::calculate(const Au
 
 	span<float, 2> frame;
 
-	dynamics::envelope_follower follower[2];
+	dynamics::envelope_follower<1> follower[2];
 
 	follower[0].setAttack(0.0);
 	follower[0].setRelease(12.0);

diff --git a/hi_dsp_library/dsp_basics/AllpassDelay.h b/hi_dsp_library/dsp_basics/AllpassDelay.h
@@ -86,7 +86,7 @@ class EnvelopeFollower
 		*
 		*	You have to call setSampleRate before you can use it.
 		*/
-		AttackRelease(float attackTime, float releaseTime);;
+		AttackRelease(float attackTime=20.0, float releaseTime=50.0);;
 
 		/** Returns the envelope value. */
 		float calculateValue(float input);;
@@ -240,4 +240,4 @@ template <int NumChannels> struct InterpolatingDelay
 	hmath Math;
 };
 
-} 
+} 
diff --git a/hi_dsp_library/dsp_nodes/DynamicsNode.cpp b/hi_dsp_library/dsp_nodes/DynamicsNode.cpp
@@ -36,31 +36,7 @@ namespace dynamics {
 using namespace hise;
 using namespace juce;
 
-void envelope_follower::createParameters(ParameterDataList& data)
-{
-	{
-		DEFINE_PARAMETERDATA(envelope_follower, Attack);
-		p.setRange({ 0.0, 1000.0, 0.1 });
-		p.setSkewForCentre(50.0);
-		p.setDefaultValue(20.0);
-
-		data.add(std::move(p));
-	}
-
-	{
-		DEFINE_PARAMETERDATA(envelope_follower, Release);
-		p.setRange({ 0.0, 1000.0, 0.1 });
-		p.setSkewForCentre(50.0);
-		p.setDefaultValue(20.0);
-
-		data.add(std::move(p));
-	}
-
-	{
-		DEFINE_PARAMETERDATA(envelope_follower, ProcessSignal);
-		data.add(std::move(p));
-	}
-}
+
 
 void updown_comp::RMSDetector::prepare(PrepareSpecs ps)
 {
@@ -302,4 +278,4 @@ void updown_comp::calculateGraph(block values)
 	}
 }
 } // dynamics
-} // scriptnode
+} // scriptnode
diff --git a/hi_dsp_library/dsp_nodes/DynamicsNode.h b/hi_dsp_library/dsp_nodes/DynamicsNode.h
@@ -294,7 +294,8 @@ using comp = dynamics_wrapper<chunkware_simple::SimpleComp>;
 using limiter = dynamics_wrapper<chunkware_simple::SimpleLimit>;
 
 
-class envelope_follower: public data::display_buffer_base<true>
+template <int NV> class envelope_follower: public data::display_buffer_base<true>,
+                         public polyphonic_base
 {
 public:
 
@@ -316,8 +317,8 @@ class envelope_follower: public data::display_buffer_base<true>
 	SN_NODE_ID("envelope_follower");
 	SN_GET_SELF_AS_OBJECT(envelope_follower);
 
-    envelope_follower() :
-      envelope(20.0, 50.0)
+    envelope_follower():
+      polyphonic_base(getStaticId(), false)
     {
 
     }
@@ -337,12 +338,14 @@ class envelope_follower: public data::display_buffer_base<true>
     {
 		display_buffer_base<true>::prepare(ps);
 
-        envelope.setSampleRate(ps.sampleRate);
+        for(auto& envelope: envelopes)
+            envelope.setSampleRate(ps.sampleRate);
     }
 
 	void reset() noexcept
     {
-        envelope.reset();
+        for(auto& envelope: envelopes)
+            envelope.reset();
     }
 
 	template <typename ProcessDataType> void process(ProcessDataType& data)
@@ -362,7 +365,7 @@ class envelope_follower: public data::display_buffer_base<true>
 		for (auto& s: data)
 			input = Math.max(Math.abs(s), input);
 
-		auto output = envelope.calculateValue(input);
+		auto output = envelopes.get().calculateValue(input);
 
 		if (processSignal)
 		{
@@ -376,22 +379,48 @@ class envelope_follower: public data::display_buffer_base<true>
 
 	void setAttack(double v)
     {
-        envelope.setAttackDouble(v);
+        for(auto& envelope: envelopes)
+            envelope.setAttackDouble(v);
     }
 
 	void setRelease(double v)
     {
-        envelope.setReleaseDouble(v);
+        for(auto& envelope: envelopes)
+            envelope.setReleaseDouble(v);
     }
 
 	void setProcessSignal(double v)
 	{
 		processSignal = v > 0.5;
 	}
 
-	void createParameters(ParameterDataList& data);
+	void createParameters(ParameterDataList& data)
+    {
+        {
+            DEFINE_PARAMETERDATA(envelope_follower, Attack);
+            p.setRange({ 0.0, 1000.0, 0.1 });
+            p.setSkewForCentre(50.0);
+            p.setDefaultValue(20.0);
+
+            data.add(std::move(p));
+        }
+
+        {
+            DEFINE_PARAMETERDATA(envelope_follower, Release);
+            p.setRange({ 0.0, 1000.0, 0.1 });
+            p.setSkewForCentre(50.0);
+            p.setDefaultValue(20.0);
+
+            data.add(std::move(p));
+        }
+
+        {
+            DEFINE_PARAMETERDATA(envelope_follower, ProcessSignal);
+            data.add(std::move(p));
+        }
+    }
 
-	EnvelopeFollower::AttackRelease envelope;
+	PolyData<EnvelopeFollower::AttackRelease, NV> envelopes;
 
 	ModValue modValue;
 	int lastNumSamples = 0;

diff --git a/hi_scripting/scripting/scriptnode/node_library/HiseNodeFactory.cpp b/hi_scripting/scripting/scriptnode/node_library/HiseNodeFactory.cpp
@@ -856,7 +856,7 @@ Factory::Factory(DspNetwork* network) :
 	registerPolyModNode<dp<comp>, dp<wrap::illegal_poly<comp>>, data::ui::displaybuffer_editor>();
 	registerPolyModNode<dp<limiter>, dp<wrap::illegal_poly<limiter>>, data::ui::displaybuffer_editor>();
 	registerPolyModNode<dp<updown_comp>, dp<wrap::illegal_poly<updown_comp>>, updown_editor>();
-	registerModNode<dp<envelope_follower>, data::ui::displaybuffer_editor >();
+	registerPolyModNode<dp<envelope_follower<1>>, dp<envelope_follower<NUM_POLYPHONIC_VOICES>>, data::ui::displaybuffer_editor >();
 }
 
 }