From 97cf4a324e72a96b874aa696af6a782fa20c2668 Mon Sep 17 00:00:00 2001 From: Daniel Walz Date: Tue, 5 Jul 2022 22:19:34 +0200 Subject: [PATCH 1/4] Made sure never to have radio group and parameter at the same time --- modules/foleys_gui_magic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/foleys_gui_magic b/modules/foleys_gui_magic index 51102bb..e7287a9 160000 --- a/modules/foleys_gui_magic +++ b/modules/foleys_gui_magic @@ -1 +1 @@ -Subproject commit 51102bb66a267f6fc83192ab7a45fa9a4e54e4cf +Subproject commit e7287a94b5fb98b25e6c2d07bffe8a12278e97ae From 2479692cb065c0121a0b4a479616fa29e1b4d857 Mon Sep 17 00:00:00 2001 From: Daniel Walz Date: Tue, 5 Jul 2022 22:44:18 +0200 Subject: [PATCH 2/4] Updated ParameterID for juce7 --- .../Source/PluginProcessor.cpp | 13 +++++++------ examples/FoleysSynth/Source/FoleysSynth.cpp | 14 +++++++------- examples/SignalGenerator/Resources/magic.xml | Bin 1897 -> 2783 bytes .../Source/PluginProcessor.cpp | 18 +++++++++--------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/examples/EqualizerExample/Source/PluginProcessor.cpp b/examples/EqualizerExample/Source/PluginProcessor.cpp index 2b95924..746e680 100644 --- a/examples/EqualizerExample/Source/PluginProcessor.cpp +++ b/examples/EqualizerExample/Source/PluginProcessor.cpp @@ -44,19 +44,19 @@ std::unique_ptr createParametersForFilter (c float quality = 1.0f, bool active = true) { - auto typeParameter = std::make_unique (prefix + IDs::paramType, + auto typeParameter = std::make_unique (juce::ParameterID (prefix + IDs::paramType, 1), name + ": " + TRANS ("Filter Type"), filterNames, type); - auto actvParameter = std::make_unique (prefix + IDs::paramActive, + auto actvParameter = std::make_unique (juce::ParameterID (prefix + IDs::paramActive, 1), name + ": " + TRANS ("Active"), active, juce::String(), [](float value, int) {return value > 0.5f ? TRANS ("active") : TRANS ("bypassed");}, [](juce::String text) {return text == TRANS ("active");}); - auto freqParameter = std::make_unique (prefix + IDs::paramFreq, + auto freqParameter = std::make_unique (juce::ParameterID (prefix + IDs::paramFreq, 1), name + ": " + TRANS ("Frequency"), foleys::Conversions::makeLogarithmicRange(20.0f, 20000.0f), frequency, @@ -69,7 +69,7 @@ std::unique_ptr createParametersForFilter (c text.getFloatValue() * 1000.0f : text.getFloatValue(); }); - auto qltyParameter = std::make_unique (prefix + IDs::paramQuality, + auto qltyParameter = std::make_unique (juce::ParameterID (prefix + IDs::paramQuality, 1), name + ": " + TRANS ("Quality"), juce::NormalisableRange {0.1f, 10.0f, 0.1f, std::log (0.5f) / std::log (0.9f / 9.9f)}, quality, @@ -78,7 +78,7 @@ std::unique_ptr createParametersForFilter (c [](float value, int) { return juce::String (value, 1); }, [](const juce::String& text) { return text.getFloatValue(); }); - auto gainParameter = std::make_unique (prefix + IDs::paramGain, + auto gainParameter = std::make_unique (juce::ParameterID (prefix + IDs::paramGain, 1), name + ": " + TRANS ("Gain"), juce::NormalisableRange {-maxLevel, maxLevel, 0.1f}, gain, @@ -108,7 +108,8 @@ juce::AudioProcessorValueTreeState::ParameterLayout createParameterLayout() params.push_back (createParametersForFilter ("Q5", NEEDS_TRANS ("Q5"), EqualizerExampleAudioProcessor::HighShelf, 5000.0f)); params.push_back (createParametersForFilter ("Q6", NEEDS_TRANS ("Q6"), EqualizerExampleAudioProcessor::LowPass, 12000.0f)); - auto param = std::make_unique (IDs::paramOutput, TRANS ("Output"), + auto param = std::make_unique (juce::ParameterID (IDs::paramOutput, 1), + TRANS ("Output"), juce::NormalisableRange (0.0f, 2.0f, 0.01f), 1.0f, juce::String(), juce::AudioProcessorParameter::genericParameter, diff --git a/examples/FoleysSynth/Source/FoleysSynth.cpp b/examples/FoleysSynth/Source/FoleysSynth.cpp index 57b0c3d..76514a1 100644 --- a/examples/FoleysSynth/Source/FoleysSynth.cpp +++ b/examples/FoleysSynth/Source/FoleysSynth.cpp @@ -25,10 +25,10 @@ int FoleysSynth::numOscillators = 8; void FoleysSynth::addADSRParameters (juce::AudioProcessorValueTreeState::ParameterLayout& layout) { - auto attack = std::make_unique(IDs::paramAttack, "Attack", juce::NormalisableRange (0.001f, 0.5f, 0.01f), 0.10f); - auto decay = std::make_unique(IDs::paramDecay, "Decay", juce::NormalisableRange (0.001f, 0.5f, 0.01f), 0.10f); - auto sustain = std::make_unique(IDs::paramSustain, "Sustain", juce::NormalisableRange (0.0f, 1.0f, 0.01f), 1.0f); - auto release = std::make_unique(IDs::paramRelease, "Release", juce::NormalisableRange (0.001f, 0.5f, 0.01f), 0.10f); + auto attack = std::make_unique(juce::ParameterID (IDs::paramAttack, 1), "Attack", juce::NormalisableRange (0.001f, 0.5f, 0.01f), 0.10f); + auto decay = std::make_unique(juce::ParameterID (IDs::paramDecay, 1), "Decay", juce::NormalisableRange (0.001f, 0.5f, 0.01f), 0.10f); + auto sustain = std::make_unique(juce::ParameterID (IDs::paramSustain, 1), "Sustain", juce::NormalisableRange (0.0f, 1.0f, 0.01f), 1.0f); + auto release = std::make_unique(juce::ParameterID (IDs::paramRelease, 1), "Release", juce::NormalisableRange (0.001f, 0.5f, 0.01f), 0.10f); auto group = std::make_unique("adsr", "ADRS", "|", std::move (attack), @@ -43,8 +43,8 @@ void FoleysSynth::addOvertoneParameters (juce::AudioProcessorValueTreeState::Par auto group = std::make_unique("oscillators", "Oscillators", "|"); for (int i = 0; i < FoleysSynth::numOscillators; ++i) { - group->addChild (std::make_unique("osc" + juce::String (i), "Oscillator " + juce::String (i), juce::NormalisableRange(0.0f, 1.0f, 0.01f), 0.0f)); - group->addChild (std::make_unique("detune" + juce::String (i), "Detune " + juce::String (i), juce::NormalisableRange(-0.5f, 0.5f, 0.01f), 0.0f)); + group->addChild (std::make_unique(juce::ParameterID ("osc" + juce::String (i), 1), "Oscillator " + juce::String (i), juce::NormalisableRange(0.0f, 1.0f, 0.01f), 0.0f)); + group->addChild (std::make_unique(juce::ParameterID ("detune" + juce::String (i), 1), "Detune " + juce::String (i), juce::NormalisableRange(-0.5f, 0.5f, 0.01f), 0.0f)); } layout.add (std::move (group)); @@ -52,7 +52,7 @@ void FoleysSynth::addOvertoneParameters (juce::AudioProcessorValueTreeState::Par void FoleysSynth::addGainParameters (juce::AudioProcessorValueTreeState::ParameterLayout& layout) { - auto gain = std::make_unique(IDs::paramGain, "Gain", juce::NormalisableRange (0.0f, 1.0f, 0.01f), 0.70f); + auto gain = std::make_unique(juce::ParameterID (IDs::paramGain, 1), "Gain", juce::NormalisableRange (0.0f, 1.0f, 0.01f), 0.70f); layout.add (std::make_unique("output", "Output", "|", std::move (gain))); } diff --git a/examples/SignalGenerator/Resources/magic.xml b/examples/SignalGenerator/Resources/magic.xml index c9d7fadea396df3c9d17710997ee1b2f92523e5d..4a05d4a6676033bfe5bbd51db9cfb654b15fe1e2 100644 GIT binary patch delta 298 zcmaFKcVBeFZf0ixw6w|lnVlF7CKs@%Oy0ws$sC+m4ied%&tk|+dJ`sdv$dhPz!=2^Wf(5N UDv#m<>?%Mmz$TM0`7>J?04TI#XaE2J delta 151 zcmcaF`jT(MZsy6{oKlnRSOVBXiZT=P(sL$1("Generator", TRANS ("Generator"), "|"); - generator->addChild (std::make_unique(IDs::mainType, "Type", juce::StringArray ("None", "Sine", "Triangle", "Square"), 1), - std::make_unique(IDs::mainFreq, "Frequency", freqRange, 440.0f), - std::make_unique(IDs::mainLevel, "Level", juce::NormalisableRange(-100.0f, 0.0f, 1.0f), -6.0f)); + generator->addChild (std::make_unique(juce::ParameterID (IDs::mainType, 1), "Type", juce::StringArray ("None", "Sine", "Triangle", "Square"), 1), + std::make_unique(juce::ParameterID (IDs::mainFreq, 1), "Frequency", freqRange, 440.0f), + std::make_unique(juce::ParameterID (IDs::mainLevel, 1), "Level", juce::NormalisableRange(-100.0f, 0.0f, 1.0f), -6.0f)); auto lfo = std::make_unique("lfo", TRANS ("LFO"), "|"); - lfo->addChild (std::make_unique(IDs::lfoType, "LFO-Type", juce::StringArray ("None", "Sine", "Triangle", "Square"), 0), - std::make_unique(IDs::lfoFreq, "Frequency", juce::NormalisableRange(0.25f, 10.0f), 2.0f), - std::make_unique(IDs::lfoLevel, "Level", juce::NormalisableRange(0.0f, 1.0f), 0.0f)); + lfo->addChild (std::make_unique(juce::ParameterID (IDs::lfoType, 1), "LFO-Type", juce::StringArray ("None", "Sine", "Triangle", "Square"), 0), + std::make_unique(juce::ParameterID (IDs::lfoFreq, 1), "Frequency", juce::NormalisableRange(0.25f, 10.0f), 2.0f), + std::make_unique(juce::ParameterID (IDs::lfoLevel, 1), "Level", juce::NormalisableRange(0.0f, 1.0f), 0.0f)); auto vfo = std::make_unique("vfo", TRANS ("VFO"), "|"); - vfo->addChild (std::make_unique(IDs::vfoType, "VFO-Type", juce::StringArray ("None", "Sine", "Triangle", "Square"), 0), - std::make_unique(IDs::vfoFreq, "Frequency", juce::NormalisableRange(0.5f, 10.0f), 2.0f), - std::make_unique(IDs::vfoLevel, "Level", juce::NormalisableRange(0.0f, 1.0), 0.0f)); + vfo->addChild (std::make_unique(juce::ParameterID (IDs::vfoType, 1), "VFO-Type", juce::StringArray ("None", "Sine", "Triangle", "Square"), 0), + std::make_unique(juce::ParameterID (IDs::vfoFreq, 1), "Frequency", juce::NormalisableRange(0.5f, 10.0f), 2.0f), + std::make_unique(juce::ParameterID (IDs::vfoLevel, 1), "Level", juce::NormalisableRange(0.0f, 1.0), 0.0f)); layout.add (std::move (generator), std::move (lfo), From 6f95d63239e93811f4440ba5b08b23533e6d7578 Mon Sep 17 00:00:00 2001 From: Daniel Walz Date: Wed, 21 Sep 2022 22:54:24 +0200 Subject: [PATCH 3/4] Added method to access ParameterMappings --- modules/foleys_gui_magic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/foleys_gui_magic b/modules/foleys_gui_magic index e7287a9..e7ca5b7 160000 --- a/modules/foleys_gui_magic +++ b/modules/foleys_gui_magic @@ -1 +1 @@ -Subproject commit e7287a94b5fb98b25e6c2d07bffe8a12278e97ae +Subproject commit e7ca5b746713d5d5a39737a30de98f1f011a0bbd From 88ad3cc45e856dcda0bbdf171c96da47a989462e Mon Sep 17 00:00:00 2001 From: Daniel Walz Date: Mon, 31 Oct 2022 10:57:13 +0100 Subject: [PATCH 4/4] Updated module --- modules/foleys_gui_magic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/foleys_gui_magic b/modules/foleys_gui_magic index e7ca5b7..bc23a31 160000 --- a/modules/foleys_gui_magic +++ b/modules/foleys_gui_magic @@ -1 +1 @@ -Subproject commit e7ca5b746713d5d5a39737a30de98f1f011a0bbd +Subproject commit bc23a3172398b8993ee03479f6058e0fcebbc376