Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stereo Field Manipulator Rename and UI Improvement #1304

Merged
merged 6 commits into from
Sep 11, 2024
Merged

Stereo Field Manipulator Rename and UI Improvement #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8040743
stereo field manipulator effect
luismrguimaraes Sep 10, 2024
7939427
merge main
luismrguimaraes Sep 10, 2024
2b309d9
rename stereo field manipulator and improve UI
luismrguimaraes Sep 11, 2024
291e40e
update sst-effects commit
luismrguimaraes Sep 11, 2024
1f26157
update basic-blocks
luismrguimaraes Sep 11, 2024
1f67606
fix conflict
luismrguimaraes Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/sst/sst-basic-blocks
Open in desktop
Submodule sst-basic-blocks updated 1 files
+6 −3 include/sst/basic-blocks/dsp/RNG.h
2 changes: 1 addition & 1 deletion libs/sst/sst-effects
Open in desktop
Submodule sst-effects updated 13 files
+127 −30 include/sst/voice-effects/delay/Chorus.h
+170 −130 include/sst/voice-effects/delay/StringResonator.h
+50 −70 include/sst/voice-effects/dynamics/Compressor.h
+1 −0 include/sst/voice-effects/eq/TiltEQ.h
+10 −3 include/sst/voice-effects/generator/GenCorrelatedNoise.h
+66 −20 include/sst/voice-effects/generator/TiltNoise.h
+39 −12 include/sst/voice-effects/modulation/FMFilter.h
+1 −1 include/sst/voice-effects/modulation/NoiseAM.h
+45 −18 include/sst/voice-effects/modulation/Phaser.h
+179 −112 include/sst/voice-effects/modulation/Tremolo.h
+20 −17 include/sst/voice-effects/utilities/StereoTool.h
+13 −14 include/sst/voice-effects/utilities/VolumeAndPan.h
+3 −3 tests/create-voice-effect.cpp
22 changes: 22 additions & 0 deletions src-ui/app/edit-screen/components/ProcessorPane.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ void ProcessorPane::rebuildControlsFromDescription()
layoutControlsMicroGate();
break;

case dsp::processor::proct_stereotool:
layoutControlsStereoTool();
break;

case dsp::processor::proct_CytomicSVF:
layoutControlsFastSVF();
break;
Expand Down Expand Up @@ -899,6 +903,24 @@ void ProcessorPane::layoutControlsMicroGate()
lo::knob<55>(*floatEditors[3], 105, 75);
}

void ProcessorPane::layoutControlsStereoTool()
{
namespace lo = theme::layout;
namespace locon = lo::constants;

floatEditors[0] = createWidgetAttachedTo(floatAttachments[0], floatAttachments[0]->getLabel());
lo::knob<55>(*floatEditors[0], 25, 0);

floatEditors[1] = createWidgetAttachedTo(floatAttachments[1], floatAttachments[1]->getLabel());
lo::knob<55>(*floatEditors[1], 105, 0);

floatEditors[2] = createWidgetAttachedTo(floatAttachments[2], floatAttachments[2]->getLabel());
lo::knob<55>(*floatEditors[2], 25, 75);

floatEditors[3] = createWidgetAttachedTo(floatAttachments[3], floatAttachments[3]->getLabel());
lo::knob<55>(*floatEditors[3], 105, 75);
}

void ProcessorPane::layoutControlsVAOsc()
{
namespace lo = theme::layout;
Expand Down
1 change: 1 addition & 0 deletions src-ui/app/edit-screen/components/ProcessorPane.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ struct ProcessorPane : sst::jucegui::components::NamedPanel, HasEditor, juce::Dr

void layoutControls();
void layoutControlsMicroGate();
void layoutControlsStereoTool();
void layoutControlsSurgeFilters();
void layoutControlsFastSVF();
void layoutControlsWaveshaper();
Expand Down
3 changes: 1 addition & 2 deletions src/dsp/processor/processor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ enum ProcessorType
proct_shepard,
proct_Chorus,
proct_volpan,
proct_stereofieldmanip,
proct_stereotool,
proct_Compressor,
proct_autowah,

Expand All @@ -134,7 +134,6 @@ enum ProcessorType
proct_fx_distortion1,
proct_fx_clipper,
proct_fx_slewer,
proct_fx_stereotools,
proct_fx_limiter,
proct_fx_gate,
proct_fx_microgate,
Expand Down
9 changes: 4 additions & 5 deletions src/dsp/processor/processor_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
#include "sst/voice-effects/modulation/NoiseAM.h"
#include "sst/voice-effects/delay/Chorus.h"
#include "sst/voice-effects/utilities/VolumeAndPan.h"
#include "sst/voice-effects/utilities/StereoFieldManipulator.h"
#include "sst/voice-effects/utilities/StereoTool.h"
#include "sst/voice-effects/dynamics/Compressor.h"
#include "sst/voice-effects/dynamics/AutoWah.h"

Expand Down Expand Up @@ -156,10 +156,9 @@ DEFINE_PROC(TiltEQ, sst::voice_effects::eq::TiltEQ<SCXTVFXConfig<1>>,
DEFINE_PROC(VolPan, sst::voice_effects::utilities::VolumeAndPan<SCXTVFXConfig<1>>,
sst::voice_effects::utilities::VolumeAndPan<SCXTVFXConfig<2>>, proct_volpan,
"Volume & Pan", "Utility", "volume-pan");
DEFINE_PROC(StereoFieldManipulator,
sst::voice_effects::utilities::StereoFieldManipulator<SCXTVFXConfig<1>>,
sst::voice_effects::utilities::StereoFieldManipulator<SCXTVFXConfig<2>>,
proct_stereofieldmanip, "Stereo Field Manipulator", "Utility", "stereo-field-manip");
DEFINE_PROC(StereoTool, sst::voice_effects::utilities::StereoTool<SCXTVFXConfig<1>>,
sst::voice_effects::utilities::StereoTool<SCXTVFXConfig<2>>, proct_stereotool,
"Stereo Tool", "Utility", "stereo-tool");
DEFINE_PROC(Widener, sst::voice_effects::delay::Widener<SCXTVFXConfig<1>>,
sst::voice_effects::delay::Widener<SCXTVFXConfig<2>>, proct_fx_widener, "Widener",
"Utility", "fxstereo-fx", dsp::surgeSincTable);
Expand Down
Loading