Added range mapping from output to input

ffAudio · ffAudio · commit 35a821334f75 · 2024-05-24T12:52:38.000+02:00
diff --git a/modules/foleys_dsp_magic/DSP/foleys_DspNode.cpp b/modules/foleys_dsp_magic/DSP/foleys_DspNode.cpp
@@ -28,9 +28,12 @@ void DspNode::addAudioInput (const juce::String& name)
     audioInputs.emplace_back (*this, ConnectionType::Audio, name, static_cast<int> (audioInputs.size()));
 }
 
-void DspNode::addParameterInput (const juce::String& name)
+void DspNode::addParameterInput (const juce::String& name, float defaultValue, float minValue, float maxValue)
 {
-    parameterInputs.emplace_back (*this, ConnectionType::Parameter, name, static_cast<int> (parameterInputs.size()));
+    auto& newInput        = parameterInputs.emplace_back (*this, ConnectionType::Parameter, name, static_cast<int> (parameterInputs.size()));
+    newInput.defaultValue = defaultValue;
+    newInput.minValue     = minValue;
+    newInput.maxValue     = maxValue;
 }
 
 void DspNode::addAudioOutput (const juce::String& name)
@@ -117,12 +120,12 @@ Input* DspNode::getInput (ConnectionType type, int index)
 
 Input* DspNode::getInputChecked (ConnectionType type, int idx)
 {
-    auto index = static_cast<size_t>(idx);
+    auto index = static_cast<size_t> (idx);
     switch (type)
     {
         case ConnectionType::MIDI: return (hasMidiInput() ? &midiInput : nullptr);
-        case ConnectionType::Audio: return (juce::isPositiveAndBelow(index, audioInputs.size()) ? &audioInputs[index] : nullptr);
-        case ConnectionType::Parameter: return (juce::isPositiveAndBelow(index, parameterInputs.size()) ? &parameterInputs[index] : nullptr);
+        case ConnectionType::Audio: return (juce::isPositiveAndBelow (index, audioInputs.size()) ? &audioInputs[index] : nullptr);
+        case ConnectionType::Parameter: return (juce::isPositiveAndBelow (index, parameterInputs.size()) ? &parameterInputs[index] : nullptr);
         case ConnectionType::Invalid: return nullptr;
         default: jassertfalse; return nullptr;
     }
diff --git a/modules/foleys_dsp_magic/DSP/foleys_DspNode.h b/modules/foleys_dsp_magic/DSP/foleys_DspNode.h
@@ -116,7 +116,7 @@ class DspNode
 
 protected:
     void addAudioInput (const juce::String& name);
-    void addParameterInput (const juce::String& name);
+    void addParameterInput (const juce::String& name, float defaultValue, float minValue, float maxValue);
 
     void addAudioOutput (const juce::String& name);
     void addParameterOutput (const juce::String& name);
diff --git a/modules/foleys_dsp_magic/DSP/foleys_Input.cpp b/modules/foleys_dsp_magic/DSP/foleys_Input.cpp
@@ -60,7 +60,7 @@ bool Input::isConnected() const
 
 void Input::connect (int sourceUID, int sourceIdx)
 {
-    sourceNode = targetNode.getProgram().getNodeWithUID(sourceUID);
+    sourceNode  = targetNode.getProgram().getNodeWithUID (sourceUID);
     sourceIndex = sourceIdx;
 
     save();
@@ -82,6 +82,45 @@ Output* Input::getOutput() const
     return sourceNode->getOutput (type, sourceIndex);
 }
 
+bool Input::isStatic() const
+{
+    if (auto* output = getOutput())
+        return output->isStatic();
+
+    return true;
+}
+
+float Input::getStaticValue() const
+{
+    if (auto* output = getOutput())
+    {
+        auto staticValue = output->getStaticValue();
+        return (minValue + output->normalize (staticValue) * (maxValue - minValue));
+    }
+
+    return defaultValue;
+}
+
+void Input::mapOutput()
+{
+    if (auto* output = getOutput())
+    {
+        auto srcMin = output->getRangeMin();
+        auto srcMax = output->getRangeMax();
+
+        if (juce::approximatelyEqual (srcMin, minValue) && juce::approximatelyEqual (srcMax, maxValue))
+            return;
+
+        auto  block   = output->getAudio();
+        auto* samples = block.getChannelPointer (0);
+
+        for (size_t i = 0; i < block.getNumSamples(); ++i)
+        {
+            samples[i] = minValue + ((samples[i] - srcMin) / (srcMax - srcMin)) * (maxValue - minValue);
+        }
+    }
+}
+
 juce::ValueTree Input::getConfigForInput()
 {
     for (const auto& child: targetNode.getConfig())
diff --git a/modules/foleys_dsp_magic/DSP/foleys_Input.h b/modules/foleys_dsp_magic/DSP/foleys_Input.h
@@ -23,10 +23,9 @@ enum class ConnectionType
 
 struct Input
 {
-
     Input (DspNode& owner, ConnectionType connectionType, const juce::String& name, int targetIndex = 0);
 
-    bool isConnected() const;
+    [[nodiscard]] bool isConnected() const;
 
     juce::ValueTree toValueTree();
 
@@ -45,6 +44,13 @@ struct Input
     static juce::String   getTypeName (ConnectionType type);
 
     [[nodiscard]] Output* getOutput() const;
+    [[nodiscard]] bool    isStatic() const;
+    [[nodiscard]] float   getStaticValue() const;
+
+    /**
+     * This maps the AudioBlock from the source range to the input range
+     */
+    void mapOutput();
 
     DspNode&           targetNode;
     ConnectionType     type = ConnectionType::Invalid;
diff --git a/modules/foleys_dsp_magic/Nodes/foleys_Biquad.cpp b/modules/foleys_dsp_magic/Nodes/foleys_Biquad.cpp
@@ -12,10 +12,10 @@ Biquad::Biquad (DspProgram& program, const juce::ValueTree& config) : DspNode (p
     addAudioInput (TRANS ("Audio In"));
     addAudioOutput (TRANS ("Audio Out"));
 
-    addParameterInput (TRANS ("Filter Type"));
-    addParameterInput (TRANS ("Frequency"));
-    addParameterInput (TRANS ("Gain"));
-    addParameterInput (TRANS ("Quality"));
+    addParameterInput (TRANS ("Type"), 0.0f, 0.0f, 5.0f);
+    addParameterInput (TRANS ("Frequency"), 1000.0f, 20.0f, 20000.0f);
+    addParameterInput (TRANS ("Gain"), 1.0f, 0.0f, 1.0f);
+    addParameterInput (TRANS ("Q"), 1.0f, 0.01f, 10.0f);
 }
 
 void Biquad::prepare ([[maybe_unused]] juce::dsp::ProcessSpec spec) { }
diff --git a/modules/foleys_dsp_magic/Nodes/foleys_Gain.cpp b/modules/foleys_dsp_magic/Nodes/foleys_Gain.cpp
@@ -11,8 +11,8 @@ namespace foleys::dsp
 Gain::Gain (DspProgram& program, const juce::ValueTree& config) : DspNode (program, config)
 {
     addAudioInput (TRANS ("Audio In"));
-    addParameterInput (TRANS ("Gain"));
-    addParameterInput (TRANS ("Phase"));
+    addParameterInput (TRANS ("Gain"), 1.0f, 0.0f, 1.0f);
+    addParameterInput (TRANS ("Phase"), 0.0f, 0.0f, 1.0f);
 
     addAudioOutput (TRANS ("Audio Out"));
 }
diff --git a/modules/foleys_dsp_magic/Nodes/foleys_Multiplier.cpp b/modules/foleys_dsp_magic/Nodes/foleys_Multiplier.cpp
@@ -10,10 +10,10 @@ namespace foleys::dsp
 
 Multiplier::Multiplier (DspProgram& program, const juce::ValueTree& config) : DspNode (program, config)
 {
-    addParameterInput (TRANS ("Param In"));
-    addParameterInput (TRANS ("Multiplier"));
-    addParameterInput (TRANS ("DC Offset"));
-    addParameterInput (TRANS ("Phase"));
+    addParameterInput (TRANS ("Param In"), 0.0f, 0.0f, 1.0f);
+    addParameterInput (TRANS ("Multiplier"), 1.0f, 0.0f, 1.0f);
+    addParameterInput (TRANS ("DC Offset"), 0.0f, -1.0f, 1.0f);
+    addParameterInput (TRANS ("Phase"), 0.0f, 0.0f, 1.0f);
 
     addParameterOutput (TRANS ("Param Out"));
 }
@@ -27,10 +27,6 @@ void Multiplier::process ([[maybe_unused]] int numSamples)
 
     output->setStaticValue (0.0);
 
-    bool phaseSwap = false;
-    if (auto* phaseParameter = getConnectedOutput (ConnectionType::Parameter, 3))
-        phaseSwap = phaseParameter->getStaticValue() < 0.5f;
-
     if (auto* input = getConnectedOutput (ConnectionType::Parameter, 0))
     {
         output->setRange (input->getRangeMin(), input->getRangeMax());
@@ -42,8 +38,6 @@ void Multiplier::process ([[maybe_unused]] int numSamples)
             if (auto* multiplier = getConnectedOutput (ConnectionType::Parameter, 1))
             {
                 multiplier->multiply (block);
-                if (phaseSwap)
-                    block *= -1.0;
             }
         }
         else
@@ -55,37 +49,45 @@ void Multiplier::process ([[maybe_unused]] int numSamples)
                     auto block = multiplier->getAudio();
                     output->setAudioBlock (block);
                     block *= input->getStaticValue();
-                    if (phaseSwap)
-                        block *= -1.0;
                 }
             }
         }
     }
 
-    if (auto* dc = getConnectedOutput (ConnectionType::Parameter, 2))
+    if (auto* dc = getInput (ConnectionType::Parameter, 2))
     {
         if (output->isStatic())
         {
             auto outputValue = output->getStaticValue();
             if (dc->isStatic())
             {
-                if (phaseSwap)
-                    output->setStaticValue (outputValue * dc->getStaticValue() * -1.0f);
-                else
-                    output->setStaticValue (outputValue * dc->getStaticValue());
+                output->setStaticValue (outputValue * dc->getStaticValue());
             }
             else
             {
-                auto block = dc->getAudio();
-                block += outputValue;
-                output->setAudioBlock (block);
-                if (phaseSwap)
-                    block *= -1.0f;
+                auto dcBlock = dc->getOutput()->getAudio();
+                dcBlock += outputValue;
+                output->setAudioBlock (dcBlock);
             }
         }
         else
         {
-            dc->add (output->getAudio());
+            auto outputBlock = output->getAudio();
+            if (dc->isStatic())
+                outputBlock += dc->getStaticValue();
+            else
+                outputBlock += dc->getOutput()->getAudio();
+        }
+    }
+
+    if (getInput (ConnectionType::Parameter, 3)->getStaticValue() > 0.5f)
+    {
+        if (output->isStatic())
+            output->setStaticValue (output->getStaticValue() * -1.0f);
+        else
+        {
+            auto block = output->getAudio();
+            block *= -1.0f;
         }
     }
 }
diff --git a/modules/foleys_dsp_magic/Nodes/foleys_Oscillator.cpp b/modules/foleys_dsp_magic/Nodes/foleys_Oscillator.cpp
@@ -16,8 +16,8 @@ Oscillator::Oscillator (DspProgram& program, const juce::ValueTree& config) : Ds
     addAudioOutput (TRANS ("Audio Out"));
     addParameterOutput (TRANS ("Signal Out"));
 
-    addParameterInput (TRANS ("Signal Type"));
-    addParameterInput (TRANS ("Frequency"));
+    addParameterInput (TRANS ("Signal Type"), 1.0f, 0.0f, 5.0f);
+    addParameterInput (TRANS ("Frequency"), 440.0f, 20.0f, 20000.0f);
 
     // make sure to repeat the first sample at the end for interpolation
     wavetable.resize (wavetablesize + 1, 0);
@@ -62,13 +62,12 @@ void Oscillator::process (int numSamples)
     buffer.clear();
     auto block = juce::dsp::AudioBlock<float> (buffer).getSubBlock (0, numSamples);
 
-    auto* signalType = getConnectedOutput (ConnectionType::Parameter, 0);
-    auto* frequency  = getConnectedOutput (ConnectionType::Parameter, 1);
+    auto* frequency = getInput (ConnectionType::Parameter, 1);
+    jassert (frequency);
 
-    if (signalType)
-        setWaveType (static_cast<WaveType> (signalType->getStaticValue()));
+    setWaveType (static_cast<WaveType> (getInput (ConnectionType::Parameter, 0)->getStaticValue()));
 
-    if (!frequency || currentWaveType == WaveType::None)
+    if (currentWaveType == WaveType::None)
     {
         getOutput (ConnectionType::Audio, 0)->setStaticValue (0.0f);
         getOutput (ConnectionType::Parameter, 0)->setStaticValue (0.0f);
@@ -79,7 +78,7 @@ void Oscillator::process (int numSamples)
     auto* ptr = block.getChannelPointer (0);
     if (frequency->isStatic())
     {
-        auto freq = frequency->normalize (frequency->getStaticValue());
+        auto freq = frequency->getStaticValue();
         auto inc  = std::clamp (static_cast<float> (freq / sampleRate), 0.0f, 1.0f);
         for (size_t i = 0; i < block.getNumSamples(); ++i)
         {
@@ -94,14 +93,17 @@ void Oscillator::process (int numSamples)
     }
     else
     {
+        auto* frequencyInput = frequency->getOutput();
+        frequency->mapOutput();
+        auto* freqs = frequencyInput->getAudio().getChannelPointer (0);
+
         for (size_t i = 0; i < block.getNumSamples(); ++i)
         {
             auto pos = phase * wavetablesize;
             auto p0  = static_cast<size_t> (pos);
             ptr[i]   = std::lerp (wavetable[p0], wavetable[p0 + 1], pos - static_cast<float> (p0));
 
-            auto freq = frequency->getValueAt (i);
-            phase += std::clamp (static_cast<float> (freq / sampleRate), 0.0f, 1.0f);
+            phase += std::clamp (static_cast<float> (freqs[i] / sampleRate), 0.0f, 1.0f);
             if (phase >= 1.0f)
                 phase -= 1.0f;
         }
diff --git a/modules/foleys_dsp_magic/Nodes/foleys_Oscilloscope.cpp b/modules/foleys_dsp_magic/Nodes/foleys_Oscilloscope.cpp
@@ -12,7 +12,7 @@ Oscilloscope::Oscilloscope (DspProgram& program, const juce::ValueTree& config)
     addAudioInput (TRANS ("Audio In"));
     addAudioOutput (TRANS ("Audio Out"));
 
-    addParameterInput (TRANS ("Param In"));
+    addParameterInput (TRANS ("Param In"), 0.0f, -1.0f, 1.0f);
 
     auto& state = program.getMagicProcessorState();
     scope       = state.getObjectWithType<MagicOscilloscope> (getName());

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,12 @@ void DspNode::addAudioInput (const juce::String& name)`
`28`	`28`	`audioInputs.emplace_back (*this, ConnectionType::Audio, name, static_cast<int> (audioInputs.size()));`
`29`	`29`	`}`
`30`	`30`
`31`		`-void DspNode::addParameterInput (const juce::String& name)`
	`31`	`+void DspNode::addParameterInput (const juce::String& name, float defaultValue, float minValue, float maxValue)`
`32`	`32`	`{`
`33`		`- parameterInputs.emplace_back (*this, ConnectionType::Parameter, name, static_cast<int> (parameterInputs.size()));`
	`33`	`+ auto& newInput = parameterInputs.emplace_back (*this, ConnectionType::Parameter, name, static_cast<int> (parameterInputs.size()));`
	`34`	`+ newInput.defaultValue = defaultValue;`
	`35`	`+ newInput.minValue = minValue;`
	`36`	`+ newInput.maxValue = maxValue;`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`void DspNode::addAudioOutput (const juce::String& name)`
`@@ -117,12 +120,12 @@ Input* DspNode::getInput (ConnectionType type, int index)`
`117`	`120`
`118`	`121`	`Input* DspNode::getInputChecked (ConnectionType type, int idx)`
`119`	`122`	`{`
`120`		`- auto index = static_cast<size_t>(idx);`
	`123`	`+ auto index = static_cast<size_t> (idx);`
`121`	`124`	`switch (type)`
`122`	`125`	`{`
`123`	`126`	`case ConnectionType::MIDI: return (hasMidiInput() ? &midiInput : nullptr);`
`124`		`- case ConnectionType::Audio: return (juce::isPositiveAndBelow(index, audioInputs.size()) ? &audioInputs[index] : nullptr);`
`125`		`- case ConnectionType::Parameter: return (juce::isPositiveAndBelow(index, parameterInputs.size()) ? &parameterInputs[index] : nullptr);`
	`127`	`+ case ConnectionType::Audio: return (juce::isPositiveAndBelow (index, audioInputs.size()) ? &audioInputs[index] : nullptr);`
	`128`	`+ case ConnectionType::Parameter: return (juce::isPositiveAndBelow (index, parameterInputs.size()) ? &parameterInputs[index] : nullptr);`
`126`	`129`	`case ConnectionType::Invalid: return nullptr;`
`127`	`130`	`default: jassertfalse; return nullptr;`
`128`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ namespace foleys::dsp`
`11`	`11`	`Gain::Gain (DspProgram& program, const juce::ValueTree& config) : DspNode (program, config)`
`12`	`12`	`{`
`13`	`13`	`addAudioInput (TRANS ("Audio In"));`
`14`		`- addParameterInput (TRANS ("Gain"));`
`15`		`- addParameterInput (TRANS ("Phase"));`
	`14`	`+ addParameterInput (TRANS ("Gain"), 1.0f, 0.0f, 1.0f);`
	`15`	`+ addParameterInput (TRANS ("Phase"), 0.0f, 0.0f, 1.0f);`
`16`	`16`
`17`	`17`	`addAudioOutput (TRANS ("Audio Out"));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ namespace foleys::dsp`
`10`	`10`
`11`	`11`	`Multiplier::Multiplier (DspProgram& program, const juce::ValueTree& config) : DspNode (program, config)`
`12`	`12`	`{`
`13`		`- addParameterInput (TRANS ("Param In"));`
`14`		`- addParameterInput (TRANS ("Multiplier"));`
`15`		`- addParameterInput (TRANS ("DC Offset"));`
`16`		`- addParameterInput (TRANS ("Phase"));`
	`13`	`+ addParameterInput (TRANS ("Param In"), 0.0f, 0.0f, 1.0f);`
	`14`	`+ addParameterInput (TRANS ("Multiplier"), 1.0f, 0.0f, 1.0f);`
	`15`	`+ addParameterInput (TRANS ("DC Offset"), 0.0f, -1.0f, 1.0f);`
	`16`	`+ addParameterInput (TRANS ("Phase"), 0.0f, 0.0f, 1.0f);`
`17`	`17`
`18`	`18`	`addParameterOutput (TRANS ("Param Out"));`
`19`	`19`	`}`
`@@ -27,10 +27,6 @@ void Multiplier::process ([[maybe_unused]] int numSamples)`
`27`	`27`
`28`	`28`	`output->setStaticValue (0.0);`
`29`	`29`
`30`		`- bool phaseSwap = false;`
`31`		`- if (auto* phaseParameter = getConnectedOutput (ConnectionType::Parameter, 3))`
`32`		`- phaseSwap = phaseParameter->getStaticValue() < 0.5f;`
`33`		`-`
`34`	`30`	`if (auto* input = getConnectedOutput (ConnectionType::Parameter, 0))`
`35`	`31`	`{`
`36`	`32`	`output->setRange (input->getRangeMin(), input->getRangeMax());`
`@@ -42,8 +38,6 @@ void Multiplier::process ([[maybe_unused]] int numSamples)`
`42`	`38`	`if (auto* multiplier = getConnectedOutput (ConnectionType::Parameter, 1))`
`43`	`39`	`{`
`44`	`40`	`multiplier->multiply (block);`
`45`		`- if (phaseSwap)`
`46`		`- block *= -1.0;`
`47`	`41`	`}`
`48`	`42`	`}`
`49`	`43`	`else`
`@@ -55,37 +49,45 @@ void Multiplier::process ([[maybe_unused]] int numSamples)`
`55`	`49`	`auto block = multiplier->getAudio();`
`56`	`50`	`output->setAudioBlock (block);`
`57`	`51`	`block *= input->getStaticValue();`
`58`		`- if (phaseSwap)`
`59`		`- block *= -1.0;`
`60`	`52`	`}`
`61`	`53`	`}`
`62`	`54`	`}`
`63`	`55`	`}`
`64`	`56`
`65`		`- if (auto* dc = getConnectedOutput (ConnectionType::Parameter, 2))`
	`57`	`+ if (auto* dc = getInput (ConnectionType::Parameter, 2))`
`66`	`58`	`{`
`67`	`59`	`if (output->isStatic())`
`68`	`60`	`{`
`69`	`61`	`auto outputValue = output->getStaticValue();`
`70`	`62`	`if (dc->isStatic())`
`71`	`63`	`{`
`72`		`- if (phaseSwap)`
`73`		`- output->setStaticValue (outputValue * dc->getStaticValue() * -1.0f);`
`74`		`- else`
`75`		`- output->setStaticValue (outputValue * dc->getStaticValue());`
	`64`	`+ output->setStaticValue (outputValue * dc->getStaticValue());`
`76`	`65`	`}`
`77`	`66`	`else`
`78`	`67`	`{`
`79`		`- auto block = dc->getAudio();`
`80`		`- block += outputValue;`
`81`		`- output->setAudioBlock (block);`
`82`		`- if (phaseSwap)`
`83`		`- block *= -1.0f;`
	`68`	`+ auto dcBlock = dc->getOutput()->getAudio();`
	`69`	`+ dcBlock += outputValue;`
	`70`	`+ output->setAudioBlock (dcBlock);`
`84`	`71`	`}`
`85`	`72`	`}`
`86`	`73`	`else`
`87`	`74`	`{`
`88`		`- dc->add (output->getAudio());`
	`75`	`+ auto outputBlock = output->getAudio();`
	`76`	`+ if (dc->isStatic())`
	`77`	`+ outputBlock += dc->getStaticValue();`
	`78`	`+ else`
	`79`	`+ outputBlock += dc->getOutput()->getAudio();`
	`80`	`+ }`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ if (getInput (ConnectionType::Parameter, 3)->getStaticValue() > 0.5f)`
	`84`	`+ {`
	`85`	`+ if (output->isStatic())`
	`86`	`+ output->setStaticValue (output->getStaticValue() * -1.0f);`
	`87`	`+ else`
	`88`	`+ {`
	`89`	`+ auto block = output->getAudio();`
	`90`	`+ block *= -1.0f;`
`89`	`91`	`}`
`90`	`92`	`}`
`91`	`93`	`}`