commit b3108c585b19a2b2a343a88423e65973f2a690d5 parent 967db5f9e32f3c1d403092d5b3afca9a0c23ed96 Author: jatinchowdhury18 <[email protected]> Date: Wed, 22 Jun 2022 12:08:53 +0100 Add parameter modulation for CLAP plugin (#273) * Start implementing parameter modulation for CLAP build * Show parameter modulation in sliders * Apply clang-format * Fix clang-tidy failures * Update submodule Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Diffstat:
33 files changed, 499 insertions(+), 447 deletions(-)
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml @@ -14,7 +14,7 @@ on: jobs: build_and_test: if: contains(toJson(github.event.commits), '***NO_CI***') == false && contains(toJson(github.event.commits), '[ci skip]') == false && contains(toJson(github.event.commits), '[skip ci]') == false - name: Apply clang-format to pull request + name: Run clang-tidy on pull request runs-on: ubuntu-latest steps: @@ -33,7 +33,7 @@ jobs: - name: Run clang-tidy shell: bash working-directory: ${{github.workspace}}/Plugin - run: find Source -iname *.cpp | xargs clang-tidy > tidy_log.txt && status=0 || status=1 + run: find Source -iname "*.cpp" -not -path "Source/Headless*" | xargs clang-tidy > tidy_log.txt && status=0 || status=1 - name: Check results shell: bash diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -5,7 +5,7 @@ this file. ## [UNRELEASED] - Added multi-channel processing support. - Added stereo/mid-side "balance" controls. -- Added CLAP plugin format support. +- Added CLAP plugin format support (with Parameter modulation). - Added option to enable/disable OpenGL on Windows/Linux systems with sufficient OpenGL support. - Improved presets system, and added new built-in presets from Carter and Cool WAV. - Fixed V1 mode creating high-pitched tone with linear phase oversampling. diff --git a/Plugin/.clang-tidy b/Plugin/.clang-tidy @@ -16,6 +16,7 @@ readability-*,\ -modernize-use-trailing-return-type,\ -readability-avoid-const-params-in-decls,\ -readability-convert-member-functions-to-static,\ +-readability-implicit-bool-conversion,\ -readability-magic-numbers,\ -readability-uppercase-literal-suffix,\ -readability-const-return-type,\ diff --git a/Plugin/Source/GUI/Assets/gui.xml b/Plugin/Source/GUI/Assets/gui.xml @@ -39,7 +39,7 @@ <View flex-grow="0.15" background-color="00000000"/> <TitleComp background-color="00000000" title="Chow Tape Model" font="35" padding="3" flex-grow="1.0"/> - <InfoComp background-color="00000000" text1="FFEAA92C" flex-grow="0.7" + <InfoComp background-color="00000000" text1="FFEAA92C" flex-grow="0.8" padding="0" margin="5" border=""/> <View background-color="00000000" flex-grow="0.15"/> </View> @@ -51,18 +51,18 @@ flex-grow="1.5" group="Basic Controls"> <View flex-direction="column" tab-color="" background-color="FF31323A" padding="0" tab-caption="Gain" group="Gain Controls Tab"> - <Slider caption="Input Gain [dB]" parameter="ingain" class="Slider" name="Input Gain" + <ModSlider caption="Input Gain" parameter="ingain" class="Slider" name="Input Gain" padding="0" margin="0" tooltip="Sets the input gain to the tape model in Decibels."/> - <Slider caption="Dry/Wet" parameter="drywet" class="Slider" tooltip="Sets dry/wet mix of the entire plugin." + <ModSlider caption="Dry/Wet" parameter="drywet" class="Slider" tooltip="Sets dry/wet mix of the entire plugin." padding="0" margin="0" name="Dry/Wet" slider-track="FF0BBDC2"/> - <Slider caption="Output Gain [dB]" parameter="outgain" class="Slider" + <ModSlider caption="Output Gain" parameter="outgain" class="Slider" padding="0" margin="0" name="Output Gain" tooltip="Sets the output gain from the tape model in Decibels."/> </View> <View flex-direction="column" tab-color="" background-color="FF31323A" padding="0" tab-caption="Filters" margin="0" group="Input/Output Filter Controls Tab"> - <Slider caption="Low Cut" parameter="ifilt_low" class="Slider" name="Low Cut" + <ModSlider caption="Low Cut" parameter="ifilt_low" class="Slider" name="Low Cut" tooltip="Applies a low cut filter before applying tape processing."/> - <Slider caption="High Cut" parameter="ifilt_high" class="Slider" name="High Cut" + <ModSlider caption="High Cut" parameter="ifilt_high" class="Slider" name="High Cut" tooltip="Applies a high cut filter before applying tape processing."/> <TextButton parameter="ifilt_makeup" text="Makeup" text_on="Makeup" background-color="00000000" margin="0" padding="5" button-color="FF33343D" flex-grow="0.35" @@ -81,7 +81,7 @@ button-color="FF33343D" button-on-color="FFB41717" button-off-text="FFFFFFFF" button-on-text="FFFFFFFF" enabled="plugin:is_stereo"/> <View margin="0" padding="0" flex-grow="0.2" background-color="00000000"/> - <Slider caption="Balance" parameter="stereo_balance" class="Slider" name="Stereo Balance" + <ModSlider caption="Balance" parameter="stereo_balance" class="Slider" name="Stereo Balance" padding="5" margin="0" enabled="plugin:is_stereo" tooltip="Controls the balance between the two channels (stereo or mid/side)."/> <View margin="0" padding="0" flex-grow="0.2" background-color="00000000"/> @@ -97,11 +97,11 @@ <View flex-direction="column" tab-color="" background-color="FF31323A" padding="0" tab-caption="Tape" margin="0" group="Tape Controls Tab"> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> - <Slider caption="Bias" parameter="width" class="Slider" name="Bias" padding="0" + <ModSlider caption="Bias" parameter="width" class="Slider" name="Bias" padding="0" margin="0" tooltip="Controls the amount of bias used by the tape recorder. Turning down the bias can create "deadzone" distortion."/> - <Slider caption="Saturation" parameter="sat" class="Slider" name="Saturation" + <ModSlider caption="Saturation" parameter="sat" class="Slider" name="Saturation" padding="0" margin="0" tooltip="Controls the amount of tape saturation applied to the signal."/> - <Slider caption="Drive" parameter="drive" class="Slider" name="Drive" + <ModSlider caption="Drive" parameter="drive" class="Slider" name="Drive" padding="0" margin="0" tooltip="Controls the amount of amplification done during the tape magnetisation process. Note that unlike the "Input Gain", this amplification is highly nonlinear."/> <PowerButton flex-grow="1.0" margin="0" padding="0" background-color="00000000" button-on-color="FFEAA92C" min-height="20" max-height="25" button-color="ff595c6b" @@ -110,11 +110,11 @@ <View flex-direction="column" tab-color="" background-color="FF31323A" padding="0" tab-caption="Comp" margin="0" group="Compression Controls Tab"> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> - <Slider caption="Amount [dB]" parameter="comp_amt" class="Slider" name="Compression Amount" + <ModSlider caption="Amount" parameter="comp_amt" class="Slider" name="Compression Amount" padding="0" margin="0" tooltip="Controls the amount of tape compression applied by the effect."/> - <Slider caption="Attack [ms]" parameter="comp_attack" class="Slider" + <ModSlider caption="Attack" parameter="comp_attack" class="Slider" name="Compression Attack" padding="0" margin="0" tooltip="Controls the attack speed of the tape compression."/> - <Slider caption="Release [ms]" parameter="comp_release" class="Slider" + <ModSlider caption="Release" parameter="comp_release" class="Slider" name="Compression Release" padding="0" margin="0" tooltip="Controls the release speed of the tape compression."/> <PowerButton flex-grow="1.0" margin="0" padding="0" background-color="00000000" button-on-color="FFEAA92C" min-height="20" max-height="25" button-color="ff595c6b" @@ -123,11 +123,11 @@ <View flex-direction="column" tab-color="" background-color="FF31323A" padding="0" tab-caption="Tone" margin="0" group="Tape Tone Controls Tab"> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> - <Slider caption="Treble" parameter="h_treble" class="Slider" name="Treble" + <ModSlider caption="Treble" parameter="h_treble" class="Slider" name="Treble" padding="0" margin="0" tooltip="Controls the treble response of the pre/post-emphasis filters."/> - <Slider caption="Bass" parameter="h_bass" class="Slider" name="Bass" + <ModSlider caption="Bass" parameter="h_bass" class="Slider" name="Bass" padding="0" margin="0" tooltip="Controls the bass response of the pre/post-emphasis filters."/> - <Slider caption="Frequency" parameter="h_tfreq" class="Slider" name="Transition Frequency" + <ModSlider caption="Frequency" parameter="h_tfreq" class="Slider" name="Transition Frequency" padding="0" margin="0" tooltip="Controls the transition frequency between the bass and treble sections of the EQ."/> <PowerButton max-height="25" min-height="20" margin="0" padding="0" background-color="00000000" button-color="ff595c6b" button-on-color="FFEAA92C" parameter="tone_onoff" @@ -138,23 +138,23 @@ lookAndFeel="MyLNF" group="Degradation Controls"> <View flex-direction="column" tab-caption="Loss" tab-color="" background-color="FF31323A" padding="0" margin="0" group="Loss Controls Tab"> - <Slider caption="Gap [microns]" parameter="gap" slider-type="linear-horizontal" + <ModSlider caption="Gap [microns]" parameter="gap" slider-type="linear-horizontal" class="Slider" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Gap" tooltip="Sets the width of the playhead gap. Certain frequencies that resonate with the gap width will be emphasized." slidertext-height="18" caption-placement="top-left"/> - <Slider caption="Thickness [microns]" parameter="thick" class="Slider" + <ModSlider caption="Thickness [microns]" parameter="thick" class="Slider" slider-type="linear-horizontal" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Thickness" tooltip="Sets the thickness of the tape. Thicker tape has a more muted high-frequency response." caption-placement="top-left"/> - <Slider caption="Spacing [microns]" parameter="spacing" slider-type="linear-horizontal" + <ModSlider caption="Spacing [microns]" parameter="spacing" slider-type="linear-horizontal" class="Slider" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Spacing" tooltip="Sets the spacing between the tape and the playhead. A larger spacing means more high frequency signal is lost during playback." caption-placement="top-left"/> - <Slider caption="Azimuth [degrees]" parameter="azimuth" slider-type="linear-horizontal" + <ModSlider caption="Azimuth [degrees]" parameter="azimuth" slider-type="linear-horizontal" class="Slider" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Azimuth" tooltip="Sets the azimuth angle between the playhead and the tape. This can create a stereo widening effect at higher tape speeds. (Stereo only)" caption-placement="top-left" enabled="plugin:is_stereo"/> - <Slider caption="Speed [ips]" parameter="speed" slider-type="linear-horizontal" + <ModSlider caption="Speed [ips]" parameter="speed" slider-type="linear-horizontal" class="Slider" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Speed" tooltip="Sets the speed of the tape as it affects the playhead loss effects. Note that this control does not affect the wow/flutter processing." caption-placement="top-left"/> @@ -182,7 +182,7 @@ <View flex-direction="column" max-height="140" background-color="FF1E1F22" flex-grow="2.0" flex-shrink="2.0" padding="0"> <View max-height="5"/> - <Slider parameter="deg_depth" caption="Depth" class="Slider" name="Depth" + <ModSlider parameter="deg_depth" caption="Depth" class="Slider" name="Depth" tooltip="Sets the depth of the tape degradation." slider-type="linear-horizontal" max-height="70" margin="0" min-height="0" slidertext-width="80" flex-grow="2.5" flex-shrink="2.5" padding=""/> @@ -194,15 +194,15 @@ name="0.1x" lookAndFeel="LookAndFeel_V3" tooltip="Scales the Depth value by 0.1 to allow for more subtle degradation"/> </View> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Amount" parameter="deg_amt" class="Slider" name="Amount" + <ModSlider caption="Amount" parameter="deg_amt" class="Slider" name="Amount" margin="0" tooltip="Sets the amount of the tape that is degraded. At large values all of the tape will be affected, at small values only some sections will be affected." slider-type="linear-horizontal" max-height="70"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider parameter="deg_var" caption="Variance" class="Slider" name="Variance" + <ModSlider parameter="deg_var" caption="Variance" class="Slider" name="Variance" margin="0" tooltip="Sets the variance of the tape degradation. Use lower values for uniform degradation, or higher values for variation across different sections of tape." slider-type="linear-horizontal" max-height="70"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider parameter="deg_env" caption="Envelope" class="Slider" name="Envelope" + <ModSlider parameter="deg_env" caption="Envelope" class="Slider" name="Envelope" margin="0" tooltip="Sets the amount of amplitude envelope applied to the tape degradation. At 0, the degradation will have no envelope." slider-type="linear-horizontal" max-height="70"/> <View margin="0" padding="0" flex-grow="0.15" background-color="00000000"/> @@ -213,11 +213,11 @@ <View tab-caption="CHEW" padding="0" flex-direction="column" background-color="FF31323A" margin="0" group="Chew Controls Tab"> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> - <Slider parameter="chew_depth" caption="Depth" padding="0" margin="0" + <ModSlider parameter="chew_depth" caption="Depth" padding="0" margin="0" class="Slider" name="Chew Depth" tooltip="Controls how intensely the tape has been chewed up."/> - <Slider caption="Frequency" parameter="chew_freq" padding="0" margin="0" + <ModSlider caption="Frequency" parameter="chew_freq" padding="0" margin="0" class="Slider" name="Chew Frequency" tooltip="Controls the amount of time in between chewed-up sections of tape."/> - <Slider caption="Variance" parameter="chew_var" padding="0" margin="0" + <ModSlider caption="Variance" parameter="chew_var" padding="0" margin="0" class="Slider" name="Chew Variance" tooltip="Controls the amount of variance in the chew frequency."/> <PowerButton margin="0" padding="0" background-color="00000000" max-height="25" min-height="20" button-color="ff595c6b" button-on-color="FFEAA92C" @@ -229,10 +229,10 @@ <FlutterMenu margin="0" padding="0" background-color="00000000" max-height="30" name="Flutter Sync" tooltip="Snaps the flutter rate to a synchronized value."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Depth" parameter="depth" max-height="150" class="Slider" + <ModSlider caption="Depth" parameter="depth" max-height="150" class="Slider" name="Flutter Depth" tooltip="Sets depth of the tape flutter." margin="0" padding="0"/> - <Slider caption="Rate" parameter="rate" class="Slider" max-height="150" + <ModSlider caption="Rate" parameter="rate" class="Slider" max-height="150" name="Flutter Rate" tooltip="Sets the rate of the tape flutter." margin="0" padding="0"/> <Plot source="flutter" plot-decay="0.8" background-color="FF1E1F22" @@ -246,16 +246,16 @@ <WowMenu margin="0" padding="0" background-color="00000000" max-height="30" name="Wow Sync" tooltip="Snaps the wow rate to a synchronized value."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Depth" parameter="wow_depth" max-height="150" class="Slider" + <ModSlider caption="Depth" parameter="wow_depth" max-height="150" class="Slider" name="Wow Depth" tooltip="Sets the depth of the tape wow." margin="0" padding="0" slider-type="linear-horizontal"/> - <Slider caption="Rate" parameter="wow_rate" class="Slider" max-height="150" + <ModSlider caption="Rate" parameter="wow_rate" class="Slider" max-height="150" name="Wow Rate" tooltip="Sets the rate of the tape wow." margin="0" padding="0" slider-type="linear-horizontal"/> - <Slider caption="Variance" parameter="wow_var" class="Slider" max-height="150" + <ModSlider caption="Variance" parameter="wow_var" class="Slider" max-height="150" name="Wow Variance" tooltip="Sets the amount of variance in the tape wow." margin="0" padding="0" slider-type="linear-horizontal"/> - <Slider caption="Drift" parameter="wow_drift" class="Slider" max-height="150" + <ModSlider caption="Drift" parameter="wow_drift" class="Slider" max-height="150" name="Wow Drift" tooltip="Sets the amount of drift in the tape wow." margin="0" padding="0" slider-type="linear-horizontal"/> <Plot source="wow" plot-decay="0.8" flex-grow="1.45" background-color="FF1E1F22" diff --git a/Plugin/Source/GUI/Assets/gui_ios.xml b/Plugin/Source/GUI/Assets/gui_ios.xml @@ -58,7 +58,7 @@ <View flex-grow="0.15" background-color="00000000"/> <TitleComp background-color="00000000" title="Chow Tape Model" font="35" padding="1" flex-grow="1.0"/> - <InfoComp background-color="00000000" text1="FFEAA92C" flex-grow="0.7" + <InfoComp background-color="00000000" text1="FFEAA92C" flex-grow="0.8" padding="0" margin="5" border=""/> <View background-color="00000000" flex-grow="0.15"/> </View> @@ -81,13 +81,13 @@ <View display="tabbed" padding="0" background-color="FF31323A" lookAndFeel="MyLNF" flex-grow="1.5"> <View flex-direction="column" tab-color="" background-color="FF31323A" padding="0" tab-caption="Gain"> - <Slider caption="Input Gain [dB]" parameter="ingain" class="Slider" name="Input Gain" + <ModSlider caption="Input Gain" parameter="ingain" class="Slider" name="Input Gain" padding="0" margin="0" tooltip="Sets the input gain to the tape model in Decibels."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Dry/Wet" parameter="drywet" class="Slider" tooltip="Sets dry/wet mix of the entire plugin." + <ModSlider caption="Dry/Wet" parameter="drywet" class="Slider" tooltip="Sets dry/wet mix of the entire plugin." padding="0" margin="0" name="Dry/Wet" slider-track="FF0BBDC2"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Output Gain [dB]" parameter="outgain" class="Slider" + <ModSlider caption="Output Gain" parameter="outgain" class="Slider" padding="0" margin="0" name="Output Gain" tooltip="Sets the output gain from the tape model in Decibels."/> </View> <View flex-direction="column" tab-color="" background-color="FF31323A" @@ -96,9 +96,9 @@ <PowerButton background-color="00000000" max-height="35" min-height="20" margin="0" padding="0" button-color="ff595c6b" button-on-color="FFEAA92C" parameter="ifilt_onoff" name="Filters On/Off" tooltip="Turns the pre-processing filters on or off."/> - <Slider caption="Low Cut" parameter="ifilt_low" class="Slider" name="Low Cut" + <ModSlider caption="Low Cut" parameter="ifilt_low" class="Slider" name="Low Cut" tooltip="Applies a low cut filter before applying tape processing."/> - <Slider caption="High Cut" parameter="ifilt_high" class="Slider" name="High Cut" + <ModSlider caption="High Cut" parameter="ifilt_high" class="Slider" name="High Cut" tooltip="Applies a high cut filter before applying tape processing."/> <TextButton parameter="ifilt_makeup" text="Makeup" text_on="Makeup" background-color="00000000" margin="0" padding="5" button-color="FF33343D" flex-grow="0.35" @@ -114,7 +114,7 @@ button-on-color="FFB41717" button-off-text="FFFFFFFF" button-on-text="FFFFFFFF" enabled="plugin:is_stereo"/> <View margin="0" padding="0" flex-grow="0.2" background-color="00000000"/> - <Slider caption="Balance" parameter="stereo_balance" class="Slider" name="Stereo Balance" + <ModSlider caption="Balance" parameter="stereo_balance" class="Slider" name="Stereo Balance" padding="5" margin="0" enabled="plugin:is_stereo" tooltip="Controls the balance between the two channels (stereo or mid/side)."/> <View margin="0" padding="0" flex-grow="0.2" background-color="00000000"/> @@ -133,13 +133,13 @@ <PowerButton flex-grow="1.0" margin="0" padding="0" background-color="00000000" button-on-color="FFEAA92C" min-height="20" max-height="35" button-color="ff595c6b" parameter="hyst_onoff" name="Tape On/Off" tooltip="Turns the tape processing on or off."/> - <Slider caption="Bias" parameter="width" class="Slider" name="Bias" padding="0" + <ModSlider caption="Bias" parameter="width" class="Slider" name="Bias" padding="0" margin="0" tooltip="Controls the amount of bias used by the tape recorder. Turning down the bias can create "deadzone" distortion."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Saturation" parameter="sat" class="Slider" name="Saturation" + <ModSlider caption="Saturation" parameter="sat" class="Slider" name="Saturation" padding="0" margin="0" tooltip="Controls the amount of tape saturation applied to the signal."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Drive" parameter="drive" class="Slider" name="Drive" + <ModSlider caption="Drive" parameter="drive" class="Slider" name="Drive" padding="0" margin="0" tooltip="Controls the amount of amplification done during the tape magnetisation process. Note that unlike the "Input Gain", this amplification is highly nonlinear."/> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> </View> @@ -149,13 +149,13 @@ <PowerButton flex-grow="1.0" margin="0" padding="0" background-color="00000000" button-on-color="FFEAA92C" min-height="20" max-height="35" button-color="ff595c6b" parameter="comp_onoff" name="Comp. On/Off" tooltip="Turns the tape compression on or off."/> - <Slider caption="Amount [dB]" parameter="comp_amt" class="Slider" name="Compression Amount" padding="0" + <ModSlider caption="Amount" parameter="comp_amt" class="Slider" name="Compression Amount" padding="0" margin="0" tooltip="Controls the amount of tape compression applied by the effect."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Attack [ms]" parameter="comp_attack" class="Slider" name="Compression Attack" + <ModSlider caption="Attack" parameter="comp_attack" class="Slider" name="Compression Attack" padding="0" margin="0" tooltip="Controls the attack speed of the tape compression."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Release [ms]" parameter="comp_release" class="Slider" name="Compression Release" + <ModSlider caption="Release" parameter="comp_release" class="Slider" name="Compression Release" padding="0" margin="0" tooltip="Controls the release speed of the tape compression."/> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> </View> @@ -165,13 +165,13 @@ <PowerButton max-height="35" min-height="20" margin="0" padding="0" background-color="00000000" button-color="ff595c6b" button-on-color="FFEAA92C" parameter="tone_onoff" name="Tone On/Off" tooltip="Turns the tone control processing on or off."/> - <Slider caption="Treble" parameter="h_treble" class="Slider" name="Treble" + <ModSlider caption="Treble" parameter="h_treble" class="Slider" name="Treble" padding="0" margin="0" tooltip="Controls the treble response of the pre/post-emphasis filters."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Bass" parameter="h_bass" class="Slider" name="Bass" + <ModSlider caption="Bass" parameter="h_bass" class="Slider" name="Bass" padding="0" margin="0" tooltip="Controls the bass response of the pre/post-emphasis filters."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Frequency" parameter="h_tfreq" class="Slider" name="Transition Frequency" + <ModSlider caption="Frequency" parameter="h_tfreq" class="Slider" name="Transition Frequency" padding="0" margin="0" tooltip="Controls the transition frequency between the bass and treble sections of the EQ."/> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> </View> @@ -184,27 +184,27 @@ <PowerButton margin="0" padding="0" background-color="00000000" max-height="32" min-height="20" button-color="ff595c6b" button-on-color="FFEAA92C" parameter="loss_onoff" name="Loss On/Off" tooltip="Turns the loss filters on or off."/> - <Slider caption="Gap [microns]" parameter="gap" slider-type="linear-horizontal" + <ModSlider caption="Gap [microns]" parameter="gap" slider-type="linear-horizontal" class="Slider" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Gap" tooltip="Sets the width of the playhead gap. Certain frequencies that resonate with the gap width will be emphasized." slidertext-height="18" caption-placement="top-left" max-height="75"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Thickness [microns]" parameter="thick" class="Slider" + <ModSlider caption="Thickness [microns]" parameter="thick" class="Slider" slider-type="linear-horizontal" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Thickness" tooltip="Sets the thickness of the tape. Thicker tape has a more muted high-frequency response." caption-placement="top-left" max-height="75"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Spacing [microns]" parameter="spacing" slider-type="linear-horizontal" + <ModSlider caption="Spacing [microns]" parameter="spacing" slider-type="linear-horizontal" class="Slider" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Spacing" tooltip="Sets the spacing between the tape and the playhead. A larger spacing means more high frequency signal is lost during playback." caption-placement="top-left" max-height="75"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Azimuth [degrees]" parameter="azimuth" slider-type="linear-horizontal" + <ModSlider caption="Azimuth [degrees]" parameter="azimuth" slider-type="linear-horizontal" class="Slider" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Azimuth" tooltip="Sets the azimuth angle between the playhead and the tape. This can create a stereo widening effect at higher tape speeds. (Stereo only)" caption-placement="top-left" max-height="75" enabled="plugin:is_stereo"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Speed [ips]" parameter="speed" slider-type="linear-horizontal" + <ModSlider caption="Speed [ips]" parameter="speed" slider-type="linear-horizontal" class="Slider" padding="0" slider-background="ff595c6b" slider-track="ff9cbcbd" name="Speed" tooltip="Sets the speed of the tape as it affects the playhead loss effects. Note that this control does not affect the wow/flutter processing." caption-placement="top-left" max-height="75"/> @@ -233,7 +233,7 @@ <View flex-direction="column" max-height="140" background-color="FF1E1F22" flex-grow="2.0" flex-shrink="2.0" padding="0"> <View max-height="5"/> - <Slider parameter="deg_depth" caption="Depth" class="Slider" name="Depth" + <ModSlider parameter="deg_depth" caption="Depth" class="Slider" name="Depth" tooltip="Sets the depth of the tape degradation." slider-type="linear-horizontal" max-height="70" margin="0" min-height="0" slidertext-width="80" flex-grow="2.5" flex-shrink="2.5" padding=""/> @@ -245,15 +245,15 @@ name="0.1x" lookAndFeel="LookAndFeel_V3" tooltip="Scales the Depth value by 0.1 to allow for more subtle degradation"/> </View> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Amount" parameter="deg_amt" class="Slider" name="Amount" + <ModSlider caption="Amount" parameter="deg_amt" class="Slider" name="Amount" margin="0" tooltip="Sets the amount of the tape that is degraded. At large values all of the tape will be affected, at small values only some sections will be affected." slider-type="linear-horizontal" max-height="70"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider parameter="deg_var" caption="Variance" class="Slider" name="Variance" + <ModSlider parameter="deg_var" caption="Variance" class="Slider" name="Variance" margin="0" tooltip="Sets the variance of the tape degradation. Use lower values for uniform degradation, or higher values for variation across different sections of tape." slider-type="linear-horizontal" max-height="70"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider parameter="deg_env" caption="Envelope" class="Slider" name="Envelope" + <ModSlider parameter="deg_env" caption="Envelope" class="Slider" name="Envelope" margin="0" tooltip="Sets the amount of amplitude envelope applied to the tape degradation. At 0, the degradation will have no envelope." slider-type="linear-horizontal" max-height="70"/> <View margin="0" padding="0" flex-grow="0.15" background-color="00000000"/> @@ -264,13 +264,13 @@ min-height="20" button-color="ff595c6b" button-on-color="FFEAA92C" parameter="chew_onoff" name="Chew On/Off" tooltip="Turns the chew processing on or off."/> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> - <Slider parameter="chew_depth" caption="Depth" padding="0" margin="0" + <ModSlider parameter="chew_depth" caption="Depth" padding="0" margin="0" class="Slider" name="Chew Depth" tooltip="Controls how intensely the tape has been chewed up."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Frequency" parameter="chew_freq" padding="0" margin="0" + <ModSlider caption="Frequency" parameter="chew_freq" padding="0" margin="0" class="Slider" name="Chew Frequency" tooltip="Controls the amount of time in between chewed-up sections of tape."/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Variance" parameter="chew_var" padding="0" margin="0" + <ModSlider caption="Variance" parameter="chew_var" padding="0" margin="0" class="Slider" name="Chew Variance" tooltip="Controls the amount of variance in the chew frequency."/> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> </View> @@ -285,11 +285,11 @@ <FlutterMenu margin="0" padding="0" background-color="00000000" max-height="35" name="Flutter Sync" tooltip="Snaps the flutter rate to a synchronized value."/> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> - <Slider caption="Depth" parameter="depth" max-height="150" class="Slider" + <ModSlider caption="Depth" parameter="depth" max-height="150" class="Slider" name="Flutter Depth" tooltip="Sets depth of the tape flutter." margin="0" padding="0"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Rate" parameter="rate" class="Slider" max-height="150" + <ModSlider caption="Rate" parameter="rate" class="Slider" max-height="150" name="Flutter Rate" tooltip="Sets the rate of the tape flutter." margin="0" padding="0"/> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> @@ -304,19 +304,19 @@ <WowMenu margin="0" padding="0" background-color="00000000" max-height="35" name="Wow Sync" tooltip="Snaps the wow rate to a synchronized value."/> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> - <Slider caption="Depth" parameter="wow_depth" max-height="65" class="Slider" + <ModSlider caption="Depth" parameter="wow_depth" max-height="65" class="Slider" name="Wow Depth" tooltip="Sets the depth of the tape wow." margin="0" padding="0" slider-type="linear-horizontal"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Rate" parameter="wow_rate" class="Slider" max-height="65" + <ModSlider caption="Rate" parameter="wow_rate" class="Slider" max-height="65" name="Wow Rate" tooltip="Sets the rate of the tape wow." margin="0" padding="0" slider-type="linear-horizontal"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Variance" parameter="wow_var" class="Slider" max-height="65" + <ModSlider caption="Variance" parameter="wow_var" class="Slider" max-height="65" name="Wow Variance" tooltip="Sets the amount of variance in the tape wow." margin="0" padding="0" slider-type="linear-horizontal"/> <View margin="0" padding="0" flex-grow="0.1" background-color="00000000"/> - <Slider caption="Drift" parameter="wow_drift" class="Slider" max-height="65" + <ModSlider caption="Drift" parameter="wow_drift" class="Slider" max-height="65" name="Wow Drift" tooltip="Sets the amount of drift in the tape wow." margin="0" padding="0" slider-type="linear-horizontal"/> <View margin="0" padding="0" flex-grow="0.05" background-color="00000000"/> diff --git a/Plugin/Source/GUI/CMakeLists.txt b/Plugin/Source/GUI/CMakeLists.txt @@ -1,5 +1,6 @@ target_sources(CHOWTapeModel PRIVATE AutoUpdating.cpp + ModulatableSlider.cpp MyLNF.cpp OversamplingMenu.cpp SettingsButton.cpp diff --git a/Plugin/Source/GUI/ModulatableSlider.cpp b/Plugin/Source/GUI/ModulatableSlider.cpp @@ -0,0 +1,108 @@ +#include "ModulatableSlider.h" + +ModSliderItem::ModSliderItem (foleys::MagicGUIBuilder& builder, const juce::ValueTree& node) : GuiItem (builder, node) +{ + setColourTranslation ( + { { "slider-background", juce::Slider::backgroundColourId }, + { "slider-thumb", juce::Slider::thumbColourId }, + { "slider-track", juce::Slider::trackColourId }, + { "rotary-fill", juce::Slider::rotarySliderFillColourId }, + { "rotary-outline", juce::Slider::rotarySliderOutlineColourId }, + { "slider-text", juce::Slider::textBoxTextColourId }, + { "slider-text-background", juce::Slider::textBoxBackgroundColourId }, + { "slider-text-highlight", juce::Slider::textBoxHighlightColourId }, + { "slider-text-outline", juce::Slider::textBoxOutlineColourId } }); + + addAndMakeVisible (slider); +} + +void ModSliderItem::update() +{ + slider.setTitle (magicBuilder.getStyleProperty (foleys::IDs::name, configNode)); + + auto type = getProperty (pSliderType).toString(); + slider.setAutoOrientation (type.isEmpty() || type == pSliderTypes[0]); + + if (type == pSliderTypes[1]) + slider.setSliderStyle (juce::Slider::LinearHorizontal); + else if (type == pSliderTypes[2]) + slider.setSliderStyle (juce::Slider::LinearVertical); + else if (type == pSliderTypes[3]) + slider.setSliderStyle (juce::Slider::Rotary); + else if (type == pSliderTypes[4]) + slider.setSliderStyle (juce::Slider::RotaryHorizontalVerticalDrag); + else if (type == pSliderTypes[5]) + slider.setSliderStyle (juce::Slider::IncDecButtons); + + auto textbox = getProperty (pSliderTextBox).toString(); + int textBoxWidth = getProperty (pSliderTextBoxWidth); + int textBoxHeight = getProperty (pSliderTextBoxHeight); + if (textbox == pTextBoxPositions[0]) + slider.setTextBoxStyle (juce::Slider::NoTextBox, false, textBoxWidth, textBoxHeight); + else if (textbox == pTextBoxPositions[1]) + slider.setTextBoxStyle (juce::Slider::TextBoxAbove, false, textBoxWidth, textBoxHeight); + else if (textbox == pTextBoxPositions[3]) + slider.setTextBoxStyle (juce::Slider::TextBoxLeft, false, textBoxWidth, textBoxHeight); + else if (textbox == pTextBoxPositions[4]) + slider.setTextBoxStyle (juce::Slider::TextBoxRight, false, textBoxWidth, textBoxHeight); + else + slider.setTextBoxStyle (juce::Slider::TextBoxBelow, false, textBoxWidth, textBoxHeight); + + double minValue = getProperty (pMinValue); + double maxValue = getProperty (pMaxValue); + if (maxValue > minValue) + slider.setRange (minValue, maxValue); + + auto valueID = configNode.getProperty (pValue, juce::String()).toString(); + if (valueID.isNotEmpty()) + slider.getValueObject().referTo (getMagicState().getPropertyAsValue (valueID)); + + auto paramID = getControlledParameterID ({}); + if (paramID.isNotEmpty()) + slider.attachToParameter (getMagicState().getParameter (paramID)); + else + slider.attachToParameter (nullptr); +} + +std::vector<foleys::SettableProperty> ModSliderItem::getSettableProperties() const +{ + std::vector<foleys::SettableProperty> props; + + props.push_back ({ configNode, foleys::IDs::parameter, foleys::SettableProperty::Choice, {}, magicBuilder.createParameterMenuLambda() }); + props.push_back ({ configNode, pSliderType, foleys::SettableProperty::Choice, pSliderTypes[0], magicBuilder.createChoicesMenuLambda (pSliderTypes) }); + props.push_back ({ configNode, pSliderTextBox, foleys::SettableProperty::Choice, pTextBoxPositions[2], magicBuilder.createChoicesMenuLambda (pTextBoxPositions) }); + props.push_back ({ configNode, pValue, foleys::SettableProperty::Choice, 1.0f, magicBuilder.createPropertiesMenuLambda() }); + props.push_back ({ configNode, pMinValue, foleys::SettableProperty::Number, 0.0f, {} }); + props.push_back ({ configNode, pMaxValue, foleys::SettableProperty::Number, 2.0f, {} }); + + return props; +} + +juce::String ModSliderItem::getControlledParameterID (juce::Point<int>) +{ + return configNode.getProperty (foleys::IDs::parameter, juce::String()).toString(); +} + +juce::Component* ModSliderItem::getWrappedComponent() +{ + return &slider; +} + +void ModSliderItem::mouseDrag (const juce::MouseEvent& e) +{ + auto numSources = juce::Desktop::getInstance().getNumDraggingMouseSources(); + if (numSources > 1) + return; + + GuiItem::mouseDrag (e); +} + +const juce::Identifier ModSliderItem::pSliderType { "slider-type" }; +const juce::StringArray ModSliderItem::pSliderTypes { "auto", "linear-horizontal", "linear-vertical", "rotary", "rotary-horizontal-vertical", "inc-dec-buttons" }; +const juce::Identifier ModSliderItem::pSliderTextBox { "slider-textbox" }; +const juce::StringArray ModSliderItem::pTextBoxPositions { "no-textbox", "textbox-above", "textbox-below", "textbox-left", "textbox-right" }; +const juce::Identifier ModSliderItem::pSliderTextBoxWidth { "slidertext-width" }; +const juce::Identifier ModSliderItem::pSliderTextBoxHeight { "slidertext-height" }; +const juce::Identifier ModSliderItem::pValue { "value" }; +const juce::Identifier ModSliderItem::pMinValue { "min-value" }; +const juce::Identifier ModSliderItem::pMaxValue { "max-value" }; diff --git a/Plugin/Source/GUI/ModulatableSlider.h b/Plugin/Source/GUI/ModulatableSlider.h @@ -0,0 +1,77 @@ +#pragma once + +#include <JuceHeader.h> + +class ModulatableSlider : public foleys::AutoOrientationSlider, + private Timer +{ +public: + ModulatableSlider() = default; + + void attachToParameter (juce::RangedAudioParameter* param) + { + if (param == nullptr) + { + attachment.reset(); + modParameter = nullptr; + stopTimer(); + return; + } + + attachment = std::make_unique<juce::SliderParameterAttachment> (*param, *this, nullptr); + modParameter = dynamic_cast<chowdsp::FloatParameter*> (param); + startTimerHz (24); + } + + double getModulatedPosition() + { + if (modParameter == nullptr) + return valueToProportionOfLength (getValue()); + + return jlimit (0.0, 1.0, valueToProportionOfLength ((double) modParameter->getCurrentValue())); + } + +private: + void timerCallback() override + { + repaint(); + } + + std::unique_ptr<juce::SliderParameterAttachment> attachment; + chowdsp::FloatParameter* modParameter = nullptr; + + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ModulatableSlider) +}; + +class ModSliderItem : public foleys::GuiItem +{ +public: + FOLEYS_DECLARE_GUI_FACTORY (ModSliderItem) + + static const juce::Identifier pSliderType; + static const juce::StringArray pSliderTypes; + + static const juce::Identifier pSliderTextBox; + static const juce::StringArray pTextBoxPositions; + static const juce::Identifier pSliderTextBoxWidth; + static const juce::Identifier pSliderTextBoxHeight; + + static const juce::Identifier pValue; + static const juce::Identifier pMinValue; + static const juce::Identifier pMaxValue; + + ModSliderItem (foleys::MagicGUIBuilder& builder, const juce::ValueTree& node); + + void update() override; + + std::vector<foleys::SettableProperty> getSettableProperties() const override; + juce::String getControlledParameterID (juce::Point<int>) override; + juce::Component* getWrappedComponent() override; + + void mouseDrag (const juce::MouseEvent& e) override; + +private: + ModulatableSlider slider; + + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ModSliderItem) +}; diff --git a/Plugin/Source/GUI/MyLNF.cpp b/Plugin/Source/GUI/MyLNF.cpp @@ -1,4 +1,5 @@ #include "MyLNF.h" +#include "ModulatableSlider.h" MyLNF::MyLNF() { @@ -41,7 +42,11 @@ void MyLNF::drawRotarySlider (juce::Graphics& g, int x, int y, int width, int he knob->drawWithin (g, knobBounds, RectanglePlacement::stretchToFit, alpha); pointer->drawWithin (g, knobBounds, RectanglePlacement::stretchToFit, alpha); - const auto toAngle = rotaryStartAngle + sliderPos * (rotaryEndAngle - rotaryStartAngle); + auto modSliderPos = sliderPos; + if (auto* modSlider = dynamic_cast<ModulatableSlider*> (&s)) + modSliderPos = (float) modSlider->getModulatedPosition(); + + const auto toAngle = rotaryStartAngle + modSliderPos * (rotaryEndAngle - rotaryStartAngle); constexpr float arcFactor = 0.9f; Path valueArc; @@ -234,7 +239,7 @@ void MyLNF::drawLinearSlider (Graphics& g, int x, int y, int width, int height, g.strokePath (backgroundTrack, { trackWidth, PathStrokeType::curved, PathStrokeType::rounded }); Path valueTrack; - Point<float> minPoint, maxPoint; + Point<float> minPoint, maxPoint, modPoint; { auto kx = slider.isHorizontal() ? sliderPos : ((float) x + (float) width * 0.5f); @@ -242,12 +247,22 @@ void MyLNF::drawLinearSlider (Graphics& g, int x, int y, int width, int height, minPoint = startPoint; maxPoint = { kx, ky }; + + modPoint = maxPoint; + if (auto* modSlider = dynamic_cast<ModulatableSlider*> (&slider)) + { + const auto modSliderPos = (float) modSlider->getModulatedPosition(); + auto kmx = slider.isHorizontal() ? (startPoint.x + (endPoint.x - startPoint.x) * modSliderPos) : ((float) x + (float) width * 0.5f); + auto kmy = slider.isHorizontal() ? ((float) y + (float) height * 0.5f) : (startPoint.y + (endPoint.y - startPoint.y) * modSliderPos); + + modPoint = { kmx, kmy }; + } } auto thumbWidth = getSliderThumbRadius (slider); valueTrack.startNewSubPath (minPoint); - valueTrack.lineTo (maxPoint); + valueTrack.lineTo (modPoint); g.setColour (slider.findColour (Slider::trackColourId).withAlpha (alpha)); g.strokePath (valueTrack, { trackWidth, PathStrokeType::curved, PathStrokeType::rounded }); diff --git a/Plugin/Source/MixGroups/MixGroupsController.cpp b/Plugin/Source/MixGroups/MixGroupsController.cpp @@ -21,9 +21,10 @@ MixGroupsController::~MixGroupsController() sharedData->removeListener (this); } -void MixGroupsController::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) +void MixGroupsController::createParameterLayout (chowdsp::Parameters& params) { - params.push_back (std::make_unique<AudioParameterChoice> (mixGroupParamID, "Mix Group", StringArray ({ "N/A", "1", "2", "3", "4" }), 0)); + using namespace chowdsp::ParamUtils; + emplace_param<chowdsp::ChoiceParameter> (params, mixGroupParamID, "Mix Group", StringArray ({ "N/A", "1", "2", "3", "4" }), 0); } void MixGroupsController::loadParameterList (Array<AudioProcessorParameter*>& params) diff --git a/Plugin/Source/MixGroups/MixGroupsController.h b/Plugin/Source/MixGroups/MixGroupsController.h @@ -17,7 +17,7 @@ public: MixGroupsController (AudioProcessorValueTreeState& vts, AudioProcessor* proc); ~MixGroupsController() override; - static void createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params); + static void createParameterLayout (chowdsp::Parameters& params); void parameterChanged (const String& parameterID, float newValue) override; void mixGroupParamChanged (const String& paramID, int mixGroup, float value, String otherUuid) override; diff --git a/Plugin/Source/PluginProcessor.cpp b/Plugin/Source/PluginProcessor.cpp @@ -9,6 +9,7 @@ */ #include "PluginProcessor.h" +#include "GUI/ModulatableSlider.h" #include "GUI/OnOff/PowerButton.h" #include "GUI/OversamplingMenu.h" #include "GUI/SettingsButton.h" @@ -16,6 +17,7 @@ #include "GUI/TooltipComp.h" #include "GUI/Visualizers/MixGroupViz.h" #include "GUI/WowFlutterMenu.h" +#include "Presets/PresetManager.h" #if JUCE_IOS #include "GUI/IOSOnly/ScrollView.h" @@ -34,26 +36,26 @@ const String dryWetTag = "drywet"; } // namespace //============================================================================== -ChowtapeModelAudioProcessor::ChowtapeModelAudioProcessor() - : AudioProcessor (BusesProperties().withInput ("Input", juce::AudioChannelSet::stereo(), true).withOutput ("Output", juce::AudioChannelSet::stereo(), true)), - vts (*this, nullptr, Identifier ("Parameters"), createParameterLayout()), - inGainDBParam (vts.getRawParameterValue (inGainTag)), - outGainDBParam (vts.getRawParameterValue (outGainTag)), - dryWetParam (vts.getRawParameterValue (dryWetTag)), - inputFilters (vts), - midSideController (vts), - toneControl (vts), - compressionProcessor (vts), - hysteresis (vts), - degrade (vts), - chewer (vts), - lossFilter (vts), - flutter (vts), - onOffManager (vts, this), - mixGroupsController (vts, this) +ChowtapeModelAudioProcessor::ChowtapeModelAudioProcessor() : inputFilters (vts), + midSideController (vts), + toneControl (vts), + compressionProcessor (vts), + hysteresis (vts), + degrade (vts), + chewer (vts), + lossFilter (vts), + flutter (vts), + onOffManager (vts, this), + mixGroupsController (vts, this) { pluginSettings->initialise (settingsFilePath); + chowdsp::ParamUtils::loadParameterPointer (inGainDBParam, vts, inGainTag); + chowdsp::ParamUtils::loadParameterPointer (outGainDBParam, vts, outGainTag); + chowdsp::ParamUtils::loadParameterPointer (dryWetParam, vts, dryWetTag); + + presetManager = std::make_unique<PresetManager> (vts); + positionInfo.bpm = 120.0; positionInfo.timeSigNumerator = 4; @@ -69,17 +71,12 @@ ChowtapeModelAudioProcessor::ChowtapeModelAudioProcessor() toneControl.setDBScale (18.0f); } -ChowtapeModelAudioProcessor::~ChowtapeModelAudioProcessor() -{ -} - -AudioProcessorValueTreeState::ParameterLayout ChowtapeModelAudioProcessor::createParameterLayout() +void ChowtapeModelAudioProcessor::addParameters (Parameters& params) { - std::vector<std::unique_ptr<RangedAudioParameter>> params; - - params.push_back (std::make_unique<AudioParameterFloat> (inGainTag, "Input Gain", -30.0f, 6.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> (outGainTag, "Output Gain", -30.0f, 30.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> (dryWetTag, "Dry/Wet", 0.0f, 100.0f, 100.0f)); + using namespace chowdsp::ParamUtils; + createGainDBParameter (params, inGainTag, "Input Gain", -30.0f, 6.0f, 0.0f); + createGainDBParameter (params, outGainTag, "Output Gain", -30.0f, 30.0f, 0.0f); + createPercentParameter (params, dryWetTag, "Dry/Wet", 1.0f); InputFilters::createParameterLayout (params); ToneControl::createParameterLayout (params); @@ -91,74 +88,8 @@ AudioProcessorValueTreeState::ParameterLayout ChowtapeModelAudioProcessor::creat ChewProcessor::createParameterLayout (params); MidSideProcessor::createParameterLayout (params); MixGroupsController::createParameterLayout (params); - - return { params.begin(), params.end() }; -} - -//============================================================================== -const String ChowtapeModelAudioProcessor::getName() const -{ - return JucePlugin_Name; -} - -bool ChowtapeModelAudioProcessor::acceptsMidi() const -{ -#if JucePlugin_WantsMidiInput - return true; -#else - return false; -#endif -} - -bool ChowtapeModelAudioProcessor::producesMidi() const -{ -#if JucePlugin_ProducesMidiOutput - return true; -#else - return false; -#endif -} - -bool ChowtapeModelAudioProcessor::isMidiEffect() const -{ -#if JucePlugin_IsMidiEffect - return true; -#else - return false; -#endif -} - -double ChowtapeModelAudioProcessor::getTailLengthSeconds() const -{ - return 0.0; } -int ChowtapeModelAudioProcessor::getNumPrograms() -{ - return presetManager.getNumPresets(); -} - -int ChowtapeModelAudioProcessor::getCurrentProgram() -{ - return presetManager.getCurrentPresetIndex(); -} - -void ChowtapeModelAudioProcessor::setCurrentProgram (int index) -{ - presetManager.loadPresetFromIndex (index); -} - -const String ChowtapeModelAudioProcessor::getProgramName (int index) -{ - return presetManager.getPresetName (index); -} - -void ChowtapeModelAudioProcessor::changeProgramName (int index, const String& newName) -{ - ignoreUnused (index, newName); -} - -//============================================================================== void ChowtapeModelAudioProcessor::prepareToPlay (double sampleRate, int samplesPerBlock) { const auto numChannels = getTotalNumInputChannels(); @@ -218,19 +149,17 @@ void ChowtapeModelAudioProcessor::processBlockBypassed (AudioBuffer<float>& buff buffer.makeCopyOf (dryBuffer, true); } -void ChowtapeModelAudioProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& midiMessages) +void ChowtapeModelAudioProcessor::processAudioBlock (AudioBuffer<float>& buffer) { - ScopedNoDenormals noDenormals; - if (auto playhead = getPlayHead()) playhead->getCurrentPosition (positionInfo); - inGain.setGain (Decibels::decibelsToGain (inGainDBParam->load())); - outGain.setGain (Decibels::decibelsToGain (outGainDBParam->load())); - dryWet.setDryWet (dryWetParam->load() / 100.0f); + inGain.setGain (Decibels::decibelsToGain (inGainDBParam->getCurrentValue())); + outGain.setGain (Decibels::decibelsToGain (outGainDBParam->getCurrentValue())); + dryWet.setDryWet (dryWetParam->getCurrentValue()); dryBuffer.makeCopyOf (buffer, true); - inGain.processBlock (buffer, midiMessages); + inGain.processBlock (buffer); inputFilters.processBlock (buffer); scope->pushSamplesIO (buffer, TapeScope::AudioType::Input); @@ -238,18 +167,18 @@ void ChowtapeModelAudioProcessor::processBlock (AudioBuffer<float>& buffer, Midi midSideController.processInput (buffer); toneControl.processBlockIn (buffer); compressionProcessor.processBlock (buffer); - hysteresis.processBlock (buffer, midiMessages); + hysteresis.processBlock (buffer); toneControl.processBlockOut (buffer); chewer.processBlock (buffer); - degrade.processBlock (buffer, midiMessages); - flutter.processBlock (buffer, midiMessages); + degrade.processBlock (buffer); + flutter.processBlock (buffer); lossFilter.processBlock (buffer); latencyCompensation(); midSideController.processOutput (buffer); inputFilters.processBlockMakeup (buffer); - outGain.processBlock (buffer, midiMessages); + outGain.processBlock (buffer); dryWet.processBlock (dryBuffer, buffer); scope->pushSamplesIO (buffer, TapeScope::AudioType::Output); @@ -280,11 +209,6 @@ void ChowtapeModelAudioProcessor::latencyCompensation() dryDelay.process (dsp::ProcessContextReplacing<float> { block }); } -bool ChowtapeModelAudioProcessor::hasEditor() const -{ - return true; -} - AudioProcessorEditor* ChowtapeModelAudioProcessor::createEditor() { if (openGLHelper == nullptr) @@ -294,6 +218,7 @@ AudioProcessorEditor* ChowtapeModelAudioProcessor::createEditor() builder->registerJUCEFactories(); builder->registerFactory ("presets", &chowdsp::PresetsItem<ChowtapeModelAudioProcessor>::factory); builder->registerFactory ("TooltipComp", &TooltipItem::factory); + builder->registerFactory ("ModSlider", &ModSliderItem::factory); builder->registerFactory ("TitleComp", &TitleItem::factory); builder->registerFactory ("MixGroupViz", &MixGroupVizItem::factory); builder->registerFactory ("PowerButton", &PowerButtonItem::factory); @@ -340,7 +265,7 @@ AudioProcessorEditor* ChowtapeModelAudioProcessor::createEditor() #if CHOWDSP_AUTO_UPDATE updater.showUpdaterScreen (editor); -#endif // CHOWDSP_AUTO_UPDATE +#endif // we need to set resize limits for StandalonePluginHolder editor->setResizeLimits (10, 10, 2000, 2000); @@ -350,18 +275,6 @@ AudioProcessorEditor* ChowtapeModelAudioProcessor::createEditor() return editor; } -String ChowtapeModelAudioProcessor::getWrapperTypeString() const -{ -#if HAS_CLAP_JUCE_EXTENSIONS - // Since we are using 'external clap' this is the one JUCE API we can't override - if (wrapperType == wrapperType_Undefined && is_clap) - return "CLAP"; -#endif - - return AudioProcessor::getWrapperTypeDescription (wrapperType); -} - -//============================================================================== void ChowtapeModelAudioProcessor::getStateInformation (MemoryBlock& destData) { auto xml = std::make_unique<XmlElement> ("state"); @@ -369,7 +282,7 @@ void ChowtapeModelAudioProcessor::getStateInformation (MemoryBlock& destData) auto state = vts.copyState(); xml->addChildElement (state.createXml().release()); - xml->addChildElement (presetManager.saveXmlState().release()); + xml->addChildElement (presetManager->saveXmlState().release()); copyXmlToBinary (*xml, destData); } @@ -393,7 +306,7 @@ void ChowtapeModelAudioProcessor::setStateInformation (const void* data, int siz if (vtsXml == nullptr) // invalid ValueTreeState return; - presetManager.loadXmlState (xmlState->getChildByName (chowdsp::PresetManager::presetStateTag)); + presetManager->loadXmlState (xmlState->getChildByName (chowdsp::PresetManager::presetStateTag)); vts.replaceState (ValueTree::fromXml (*vtsXml)); } else @@ -405,7 +318,6 @@ void ChowtapeModelAudioProcessor::setStateInformation (const void* data, int siz } } -//============================================================================== // This creates new instances of the plugin.. AudioProcessor* JUCE_CALLTYPE createPluginFilter() { diff --git a/Plugin/Source/PluginProcessor.h b/Plugin/Source/PluginProcessor.h @@ -14,7 +14,6 @@ #include "GUI/OnOff/OnOffManager.h" #include "GUI/Visualizers/TapeScope.h" #include "MixGroups/MixGroupsController.h" -#include "Presets/PresetManager.h" #include "Processors/Chew/ChewProcessor.h" #include "Processors/Compression/CompressionProcessor.h" #include "Processors/Degrade/DegradeProcessor.h" @@ -35,57 +34,29 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE #if CHOWDSP_AUTO_UPDATE #include "GUI/AutoUpdating.h" -#endif // CHOWDSP_AUTO_UPDATE - -//============================================================================== -/** -*/ -class ChowtapeModelAudioProcessor : public AudioProcessor -#if HAS_CLAP_JUCE_EXTENSIONS - , - private clap_juce_extensions::clap_properties #endif + +class ChowtapeModelAudioProcessor : public chowdsp::PluginBase<ChowtapeModelAudioProcessor> { public: - //============================================================================== ChowtapeModelAudioProcessor(); - ~ChowtapeModelAudioProcessor() override; - //============================================================================== + static void addParameters (Parameters& params); + void prepareToPlay (double sampleRate, int samplesPerBlock) override; void releaseResources() override; bool isBusesLayoutSupported (const BusesLayout& layouts) const override; - void processBlock (AudioBuffer<float>&, MidiBuffer&) override; + void processAudioBlock (AudioBuffer<float>&) override; void processBlockBypassed (AudioBuffer<float>&, MidiBuffer&) override; - - //============================================================================== - AudioProcessorEditor* createEditor() override; - bool hasEditor() const override; - - //============================================================================== - const String getName() const override; - - bool acceptsMidi() const override; - bool producesMidi() const override; - bool isMidiEffect() const override; - double getTailLengthSeconds() const override; float calcLatencySamples() const noexcept; - //============================================================================== - int getNumPrograms() override; - int getCurrentProgram() override; - void setCurrentProgram (int index) override; - const String getProgramName (int index) override; - void changeProgramName (int index, const String& newName) override; + AudioProcessorEditor* createEditor() override; - //============================================================================== void getStateInformation (MemoryBlock& destData) override; void setStateInformation (const void* data, int sizeInBytes) override; - String getWrapperTypeString() const; - PresetManager& getPresetManager() { return presetManager; } const AudioProcessorValueTreeState& getVTS() const { return vts; } AudioProcessorValueTreeState& getVTS() { return vts; } const AudioPlayHead::CurrentPositionInfo& getPositionInfo() const { return positionInfo; } @@ -94,16 +65,13 @@ public: private: using DryDelayType = chowdsp::DelayLine<float, chowdsp::DelayLineInterpolationTypes::Lagrange5th>; - - AudioProcessorValueTreeState::ParameterLayout createParameterLayout(); void latencyCompensation(); chowdsp::SharedPluginSettings pluginSettings; - AudioProcessorValueTreeState vts; - std::atomic<float>* inGainDBParam = nullptr; - std::atomic<float>* outGainDBParam = nullptr; - std::atomic<float>* dryWetParam = nullptr; + chowdsp::FloatParameter* inGainDBParam = nullptr; + chowdsp::FloatParameter* outGainDBParam = nullptr; + chowdsp::FloatParameter* dryWetParam = nullptr; GainProcessor inGain; InputFilters inputFilters; @@ -125,7 +93,6 @@ private: foleys::MagicProcessorState magicState { *this, vts }; TapeScope* scope = nullptr; - PresetManager presetManager { vts }; MyLNF myLNF; MixGroupsController mixGroupsController; AudioPlayHead::CurrentPositionInfo positionInfo; @@ -134,8 +101,7 @@ private: #if CHOWDSP_AUTO_UPDATE AutoUpdater updater; -#endif // CHOWDSP_AUTO_UPDATE +#endif - //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ChowtapeModelAudioProcessor) }; diff --git a/Plugin/Source/Processors/Chew/ChewProcessor.cpp b/Plugin/Source/Processors/Chew/ChewProcessor.cpp @@ -2,18 +2,20 @@ ChewProcessor::ChewProcessor (AudioProcessorValueTreeState& vts) { - depth = vts.getRawParameterValue ("chew_depth"); - freq = vts.getRawParameterValue ("chew_freq"); - var = vts.getRawParameterValue ("chew_var"); + using namespace chowdsp::ParamUtils; + loadParameterPointer (depth, vts, "chew_depth"); + loadParameterPointer (freq, vts, "chew_freq"); + loadParameterPointer (var, vts, "chew_var"); onOff = vts.getRawParameterValue ("chew_onoff"); } -void ChewProcessor::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) +void ChewProcessor::createParameterLayout (chowdsp::Parameters& params) { - params.push_back (std::make_unique<AudioParameterBool> ("chew_onoff", "Chew On/Off", false)); - params.push_back (std::make_unique<AudioParameterFloat> ("chew_depth", "Chew Depth", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("chew_freq", "Chew Freq", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("chew_var", "Chew Variance", 0.0f, 1.0f, 0.0f)); + using namespace chowdsp::ParamUtils; + emplace_param<chowdsp::BoolParameter> (params, "chew_onoff", "Chew On/Off", false); + emplace_param<chowdsp::FloatParameter> (params, "chew_depth", "Chew Depth", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "chew_freq", "Chew Freq", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "chew_var", "Chew Variance", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); } void ChewProcessor::prepare (double sr, int samplesPerBlock, int numChannels) diff --git a/Plugin/Source/Processors/Chew/ChewProcessor.h b/Plugin/Source/Processors/Chew/ChewProcessor.h @@ -10,7 +10,7 @@ class ChewProcessor public: ChewProcessor (AudioProcessorValueTreeState& vts); - static void createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params); + static void createParameterLayout (chowdsp::Parameters& params); void prepare (double sr, int samplesPerBlock, int numChannels); void processBlock (AudioBuffer<float>& buffer); @@ -18,9 +18,9 @@ public: private: std::atomic<float>* onOff = nullptr; - std::atomic<float>* depth = nullptr; - std::atomic<float>* freq = nullptr; - std::atomic<float>* var = nullptr; + chowdsp::FloatParameter* depth = nullptr; + chowdsp::FloatParameter* freq = nullptr; + chowdsp::FloatParameter* var = nullptr; float mix = 0.0f; float power = 0.0f; @@ -38,7 +38,7 @@ private: inline int getDryTime() { auto tScale = pow (*freq, 0.1f); - auto varScale = pow (random.nextFloat() * 2.0f, var->load()); + auto varScale = pow (random.nextFloat() * 2.0f, var->getCurrentValue()); return random.nextInt (Range<int> ((int) ((1.0 - tScale) * sampleRate * varScale), (int) ((2 - 1.99 * tScale) * sampleRate * varScale))); } @@ -48,7 +48,7 @@ private: auto tScale = pow (*freq, 0.1f); auto start = 0.2 + 0.8 * *depth; auto end = start - (0.001 + 0.01 * *depth); - auto varScale = pow (random.nextFloat() * 2.0f, var->load()); + auto varScale = pow (random.nextFloat() * 2.0f, var->getCurrentValue()); return random.nextInt (Range<int> ((int) ((1.0 - tScale) * sampleRate * varScale), (int) (((1.0 - tScale) + start - end * tScale) * sampleRate * varScale))); diff --git a/Plugin/Source/Processors/Compression/CompressionProcessor.cpp b/Plugin/Source/Processors/Compression/CompressionProcessor.cpp @@ -2,29 +2,20 @@ CompressionProcessor::CompressionProcessor (AudioProcessorValueTreeState& vts) { + using namespace chowdsp::ParamUtils; onOff = vts.getRawParameterValue ("comp_onoff"); - amountParam = vts.getRawParameterValue ("comp_amt"); - attackParam = vts.getRawParameterValue ("comp_attack"); - releaseParam = vts.getRawParameterValue ("comp_release"); + loadParameterPointer (amountParam, vts, "comp_amt"); + loadParameterPointer (attackParam, vts, "comp_attack"); + loadParameterPointer (releaseParam, vts, "comp_release"); } -void CompressionProcessor::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) +void CompressionProcessor::createParameterLayout (chowdsp::Parameters& params) { - auto twoDecimalFloat = [] (float value, int) { return String (value, 2); }; - - params.push_back (std::make_unique<AudioParameterBool> ("comp_onoff", "Compression On/Off", false)); - - static NormalisableRange<float> amtRange { 0.0f, 9.0f }; - amtRange.setSkewForCentre (3.0f); - params.push_back (std::make_unique<AudioParameterFloat> ("comp_amt", "Compression Amount", amtRange, 0.0f, String(), AudioProcessorParameter::genericParameter, twoDecimalFloat)); - - static NormalisableRange<float> attRange { 0.1f, 50.0f }; - attRange.setSkewForCentre (10.0f); - params.push_back (std::make_unique<AudioParameterFloat> ("comp_attack", "Compression Attack", attRange, 5.0f, String(), AudioProcessorParameter::genericParameter, twoDecimalFloat)); - - static NormalisableRange<float> relRange { 10.0f, 1000.0f }; - relRange.setSkewForCentre (100.0f); - params.push_back (std::make_unique<AudioParameterFloat> ("comp_release", "Compression Release", relRange, 200.0f, String(), AudioProcessorParameter::genericParameter, twoDecimalFloat)); + using namespace chowdsp::ParamUtils; + emplace_param<chowdsp::BoolParameter> (params, "comp_onoff", "Compression On/Off", false); + createGainDBParameter (params, "comp_amt", "Compression Amount", 0.0f, 9.0f, 0.0f, 3.0f); + createTimeMsParameter (params, "comp_attack", "Compression Attack", createNormalisableRange (0.1f, 50.0f, 10.0f), 5.0f); + createTimeMsParameter (params, "comp_release", "Compression Release", createNormalisableRange (10.0f, 1000.0f, 100.0f), 200.0f); } void CompressionProcessor::prepare (double sr, int samplesPerBlock, int numChannels) @@ -74,7 +65,7 @@ void CompressionProcessor::processBlock (AudioBuffer<float>& buffer) const auto numSamples = (int) osBlock.getNumSamples(); for (int ch = 0; ch < buffer.getNumChannels(); ++ch) { - dbPlusSmooth[ch].setTargetValue (amountParam->load()); + dbPlusSmooth[ch].setTargetValue (amountParam->getCurrentValue()); auto* x = osBlock.getChannelPointer ((size_t) ch); FloatVectorOperations::copy (xDBVec.data(), x, numSamples); @@ -103,7 +94,7 @@ void CompressionProcessor::processBlock (AudioBuffer<float>& buffer) } // since the slew will be applied to the gain, we need to reverse the attack and release parameters! - slewLimiter[ch].setParameters (releaseParam->load(), attackParam->load()); + slewLimiter[ch].setParameters (releaseParam->getCurrentValue(), attackParam->getCurrentValue()); for (size_t k = 0; k < (size_t) numSamples; ++k) compGainVec[k] = jmin (compGainVec[k], slewLimiter[ch].processSample (compGainVec[k])); diff --git a/Plugin/Source/Processors/Compression/CompressionProcessor.h b/Plugin/Source/Processors/Compression/CompressionProcessor.h @@ -9,7 +9,7 @@ class CompressionProcessor public: CompressionProcessor (AudioProcessorValueTreeState& vts); - static void createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params); + static void createParameterLayout (chowdsp::Parameters& params); void prepare (double sr, int samplesPerBlock, int numChannels); void processBlock (AudioBuffer<float>& buffer); @@ -18,9 +18,9 @@ public: private: std::atomic<float>* onOff = nullptr; - std::atomic<float>* amountParam = nullptr; - std::atomic<float>* attackParam = nullptr; - std::atomic<float>* releaseParam = nullptr; + chowdsp::FloatParameter* amountParam = nullptr; + chowdsp::FloatParameter* attackParam = nullptr; + chowdsp::FloatParameter* releaseParam = nullptr; std::vector<chowdsp::LevelDetector<float>> slewLimiter; BypassProcessor bypass; diff --git a/Plugin/Source/Processors/Degrade/DegradeProcessor.cpp b/Plugin/Source/Processors/Degrade/DegradeProcessor.cpp @@ -2,28 +2,30 @@ DegradeProcessor::DegradeProcessor (AudioProcessorValueTreeState& vts) { + using namespace chowdsp::ParamUtils; point1xParam = vts.getRawParameterValue ("deg_point1x"); onOffParam = vts.getRawParameterValue ("deg_onoff"); - depthParam = vts.getRawParameterValue ("deg_depth"); - amtParam = vts.getRawParameterValue ("deg_amt"); - varParam = vts.getRawParameterValue ("deg_var"); - envParam = vts.getRawParameterValue ("deg_env"); + loadParameterPointer (depthParam, vts, "deg_depth"); + loadParameterPointer (amtParam, vts, "deg_amt"); + loadParameterPointer (varParam, vts, "deg_var"); + loadParameterPointer (envParam, vts, "deg_env"); } -void DegradeProcessor::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) +void DegradeProcessor::createParameterLayout (chowdsp::Parameters& params) { - params.push_back (std::make_unique<AudioParameterBool> ("deg_point1x", "Degrade Point1x", false)); - params.push_back (std::make_unique<AudioParameterBool> ("deg_onoff", "Degrade On/Off", false)); - params.push_back (std::make_unique<AudioParameterFloat> ("deg_depth", "Degrade Depth", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("deg_amt", "Degrade Amount", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("deg_var", "Degrade Variance", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("deg_env", "Degrade Envelope", 0.0f, 1.0f, 0.0f)); + using namespace chowdsp::ParamUtils; + emplace_param<chowdsp::BoolParameter> (params, "deg_point1x", "Degrade Point1x", false); + emplace_param<chowdsp::BoolParameter> (params, "deg_onoff", "Degrade On/Off", false); + emplace_param<chowdsp::FloatParameter> (params, "deg_depth", "Degrade Depth", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "deg_amt", "Degrade Amount", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "deg_var", "Degrade Variance", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "deg_env", "Degrade Envelope", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); } void DegradeProcessor::cookParams() { auto point1x = static_cast<bool> (point1xParam->load()); - auto depthValue = point1x ? depthParam->load() * 0.1f : depthParam->load(); + auto depthValue = point1x ? depthParam->getCurrentValue() * 0.1f : depthParam->getCurrentValue(); float freqHz = 200.0f * powf (20000.0f / 200.0f, 1.0f - *amtParam); float gainDB = -24.0f * depthValue; @@ -34,7 +36,7 @@ void DegradeProcessor::cookParams() for (auto& filter : filterProc) filter.setFreq (jmin (freqHz + (*varParam * (freqHz / 0.6f) * (random.nextFloat() - 0.5f)), 0.49f * fs)); - auto envSkew = 1.0f - std::pow (envParam->load(), 0.8f); + auto envSkew = 1.0f - std::pow (envParam->getCurrentValue(), 0.8f); levelDetector.setParameters (10.0f, 20.0f * std::pow (5000.0f / 20.0f, envSkew)); gainProc.setGain (Decibels::decibelsToGain (jmin (gainDB + (*varParam * 36.0f * (random.nextFloat() - 0.5f)), 3.0f))); } @@ -62,7 +64,7 @@ void DegradeProcessor::prepareToPlay (double sampleRate, int samplesPerBlock, in sampleCounter = 0; } -void DegradeProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& midi) +void DegradeProcessor::processBlock (AudioBuffer<float>& buffer) { const auto numChannels = buffer.getNumChannels(); const auto numSamples = buffer.getNumSamples(); @@ -71,13 +73,13 @@ void DegradeProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& mid int samplesToProcess = jmin (smallBlockSize, numSamples - i); auto&& smallBuffer = AudioBuffer<float> { buffer.getArrayOfWritePointers(), numChannels, i, samplesToProcess }; - processShortBlock (smallBuffer, midi); + processShortBlock (smallBuffer); i += samplesToProcess; } } -void DegradeProcessor::processShortBlock (AudioBuffer<float>& buffer, MidiBuffer& midi) +void DegradeProcessor::processShortBlock (AudioBuffer<float>& buffer) { if (! bypass.processBlockIn (buffer, bypass.toBool (onOffParam))) return; @@ -101,7 +103,7 @@ void DegradeProcessor::processShortBlock (AudioBuffer<float>& buffer, MidiBuffer levelDetector.process (levelContext); const auto* levelPtr = levelBuffer.getReadPointer (0); - const auto applyEnvelope = envParam->load() > 0.0f; + const auto applyEnvelope = envParam->getCurrentValue() > 0.0f; for (int ch = 0; ch < numChannels; ++ch) { auto* noisePtr = noiseBuffer.getWritePointer (ch); @@ -116,6 +118,6 @@ void DegradeProcessor::processShortBlock (AudioBuffer<float>& buffer, MidiBuffer filterProc[(size_t) ch].process (xPtr, numSamples); } - gainProc.processBlock (buffer, midi); + gainProc.processBlock (buffer); bypass.processBlockOut (buffer, bypass.toBool (onOffParam)); } diff --git a/Plugin/Source/Processors/Degrade/DegradeProcessor.h b/Plugin/Source/Processors/Degrade/DegradeProcessor.h @@ -11,21 +11,21 @@ class DegradeProcessor public: DegradeProcessor (AudioProcessorValueTreeState& vts); - static void createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params); + static void createParameterLayout (chowdsp::Parameters& params); void cookParams(); void prepareToPlay (double sampleRate, int samplesPerBlock, int numChannels); - void processBlock (AudioBuffer<float>& buffer, MidiBuffer& midi); + void processBlock (AudioBuffer<float>& buffer); private: - void processShortBlock (AudioBuffer<float>& buffer, MidiBuffer& midi); + void processShortBlock (AudioBuffer<float>& buffer); std::atomic<float>* point1xParam = nullptr; std::atomic<float>* onOffParam = nullptr; - std::atomic<float>* depthParam = nullptr; - std::atomic<float>* amtParam = nullptr; - std::atomic<float>* varParam = nullptr; - std::atomic<float>* envParam = nullptr; + chowdsp::FloatParameter* depthParam = nullptr; + chowdsp::FloatParameter* amtParam = nullptr; + chowdsp::FloatParameter* varParam = nullptr; + chowdsp::FloatParameter* envParam = nullptr; std::vector<DegradeFilter> filterProc; GainProcessor gainProc; diff --git a/Plugin/Source/Processors/GainProcessor.h b/Plugin/Source/Processors/GainProcessor.h @@ -13,7 +13,7 @@ public: oldGain = curGain; } - void processBlock (AudioBuffer<float>& buffer, MidiBuffer& /*midiMessages*/) + void processBlock (AudioBuffer<float>& buffer) { if (curGain != oldGain) { diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.cpp b/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.cpp @@ -44,21 +44,23 @@ static void deinterleaveSamples (const T* source, T** dest, int numSamples, int HysteresisProcessor::HysteresisProcessor (AudioProcessorValueTreeState& vts) : osManager (vts) { - driveParam = vts.getRawParameterValue ("drive"); - satParam = vts.getRawParameterValue ("sat"); - widthParam = vts.getRawParameterValue ("width"); + using namespace chowdsp::ParamUtils; + loadParameterPointer (driveParam, vts, "drive"); + loadParameterPointer (satParam, vts, "sat"); + loadParameterPointer (widthParam, vts, "width"); modeParam = vts.getRawParameterValue ("mode"); onOffParam = vts.getRawParameterValue ("hyst_onoff"); } -void HysteresisProcessor::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) +void HysteresisProcessor::createParameterLayout (chowdsp::Parameters& params) { - params.push_back (std::make_unique<AudioParameterBool> ("hyst_onoff", "Tape On/Off", true)); - params.push_back (std::make_unique<AudioParameterFloat> ("drive", "Tape Drive", 0.0f, 1.0f, 0.5f)); - params.push_back (std::make_unique<AudioParameterFloat> ("sat", "Tape Saturation", 0.0f, 1.0f, 0.5f)); - params.push_back (std::make_unique<AudioParameterFloat> ("width", "Tape Bias", 0.0f, 1.0f, 0.5f)); + using namespace chowdsp::ParamUtils; + emplace_param<chowdsp::BoolParameter> (params, "hyst_onoff", "Tape On/Off", true); + emplace_param<chowdsp::FloatParameter> (params, "drive", "Tape Drive", NormalisableRange { 0.0f, 1.0f }, 0.5f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "sat", "Tape Saturation", NormalisableRange { 0.0f, 1.0f }, 0.5f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "width", "Tape Bias", NormalisableRange { 0.0f, 1.0f }, 0.5f, &floatValToString, &stringToFloatVal); - params.push_back (std::make_unique<AudioParameterChoice> ("mode", "Tape Mode", StringArray ({ "RK2", "RK4", "NR4", "NR8", "STN", "V1" }), 0)); + emplace_param<chowdsp::ChoiceParameter> (params, "mode", "Tape Mode", StringArray ({ "RK2", "RK4", "NR4", "NR8", "STN", "V1" }), 0); using OSManager = decltype (osManager); OSManager::createParameterLayout (params, OSManager::OSFactor::TwoX, OSManager::OSMode::MinPhase); @@ -66,11 +68,8 @@ void HysteresisProcessor::createParameterLayout (std::vector<std::unique_ptr<Ran void HysteresisProcessor::setSolver (int newSolver) { - if (newSolver == SolverType::NUM_SOLVERS) // V1 - useV1 = true; - else - useV1 = false; - + // Hack for V1 solver mode + useV1 = newSolver == SolverType::NUM_SOLVERS; solver = useV1 ? RK4 : static_cast<SolverType> (newSolver); // set clip level for solver @@ -195,7 +194,7 @@ float HysteresisProcessor::getLatencySamples() const noexcept : 0.0f; // off } -void HysteresisProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& /*midi*/) +void HysteresisProcessor::processBlock (AudioBuffer<float>& buffer) { const auto numChannels = buffer.getNumChannels(); diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.h b/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.h @@ -18,9 +18,9 @@ public: void releaseResources(); /* Proceess a buffer. */ - void processBlock (AudioBuffer<float>& buffer, MidiBuffer& midiBuffer); + void processBlock (AudioBuffer<float>& buffer); - static void createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params); + static void createParameterLayout (chowdsp::Parameters& params); float getLatencySamples() const noexcept; auto& getOSManager() { return osManager; } @@ -44,9 +44,9 @@ private: void processSmoothV1 (dsp::AudioBlock<T>& block); void applyDCBlockers (AudioBuffer<float>& buffer); - std::atomic<float>* driveParam = nullptr; - std::atomic<float>* satParam = nullptr; - std::atomic<float>* widthParam = nullptr; + chowdsp::FloatParameter* driveParam = nullptr; + chowdsp::FloatParameter* satParam = nullptr; + chowdsp::FloatParameter* widthParam = nullptr; std::atomic<float>* modeParam = nullptr; std::atomic<float>* onOffParam = nullptr; diff --git a/Plugin/Source/Processors/Hysteresis/ToneControl.cpp b/Plugin/Source/Processors/Hysteresis/ToneControl.cpp @@ -72,9 +72,10 @@ void ToneStage::processBlock (AudioBuffer<float>& buffer) //=================================================== ToneControl::ToneControl (AudioProcessorValueTreeState& vts) { - bassParam = vts.getRawParameterValue ("h_bass"); - trebleParam = vts.getRawParameterValue ("h_treble"); - tFreqParam = vts.getRawParameterValue ("h_tfreq"); + using namespace chowdsp::ParamUtils; + loadParameterPointer (bassParam, vts, "h_bass"); + loadParameterPointer (trebleParam, vts, "h_treble"); + loadParameterPointer (tFreqParam, vts, "h_tfreq"); onOffParam = vts.getRawParameterValue ("tone_onoff"); } @@ -83,18 +84,11 @@ void ToneControl::createParameterLayout (std::vector<std::unique_ptr<RangedAudio NormalisableRange freqRange { 100.0f, 4000.0f }; freqRange.setSkewForCentre (transFreq); - params.push_back (std::make_unique<AudioParameterBool> ("tone_onoff", "Tone On/Off", true)); - params.push_back (std::make_unique<AudioParameterFloat> ("h_bass", "Tone Bass", -1.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("h_treble", "Tone Treble", -1.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("h_tfreq", "Tone Transition Frequency", freqRange, transFreq, String(), AudioProcessorParameter::genericParameter, [=] (float val, int) { - String suffix = " Hz"; - if (val > 1000.0f) - { - val /= 1000.0f; - suffix = " kHz"; - } - return String (val, 2, false) + suffix; - })); + using namespace chowdsp::ParamUtils; + emplace_param<chowdsp::BoolParameter> (params, "tone_onoff", "Tone On/Off", true); + emplace_param<chowdsp::FloatParameter> (params, "h_bass", "Tone Bass", NormalisableRange { -1.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "h_treble", "Tone Treble", NormalisableRange { -1.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + createFreqParameter (params, "h_tfreq", "Tone Transition Frequency", 100.0f, 4000.0f, transFreq, transFreq); } void ToneControl::prepare (double sampleRate, int numChannels) @@ -107,15 +101,15 @@ void ToneControl::processBlockIn (AudioBuffer<float>& buffer) { if (static_cast<bool> (onOffParam->load())) { - toneIn.setLowGain (dbScale * bassParam->load()); - toneIn.setHighGain (dbScale * trebleParam->load()); + toneIn.setLowGain (dbScale * bassParam->getCurrentValue()); + toneIn.setHighGain (dbScale * trebleParam->getCurrentValue()); } else { toneIn.setLowGain (0.0f); toneIn.setHighGain (0.0f); } - toneIn.setTransFreq (tFreqParam->load()); + toneIn.setTransFreq (tFreqParam->getCurrentValue()); toneIn.processBlock (buffer); } @@ -124,15 +118,15 @@ void ToneControl::processBlockOut (AudioBuffer<float>& buffer) { if (static_cast<bool> (onOffParam->load())) { - toneOut.setLowGain (-1.0f * dbScale * bassParam->load()); - toneOut.setHighGain (-1.0f * dbScale * trebleParam->load()); + toneOut.setLowGain (-1.0f * dbScale * bassParam->getCurrentValue()); + toneOut.setHighGain (-1.0f * dbScale * trebleParam->getCurrentValue()); } else { toneOut.setLowGain (0.0f); toneOut.setHighGain (0.0f); } - toneOut.setTransFreq (tFreqParam->load()); + toneOut.setTransFreq (tFreqParam->getCurrentValue()); toneOut.processBlock (buffer); } diff --git a/Plugin/Source/Processors/Hysteresis/ToneControl.h b/Plugin/Source/Processors/Hysteresis/ToneControl.h @@ -36,9 +36,9 @@ private: ToneStage toneIn, toneOut; std::atomic<float>* onOffParam = nullptr; - std::atomic<float>* bassParam = nullptr; - std::atomic<float>* trebleParam = nullptr; - std::atomic<float>* tFreqParam = nullptr; + chowdsp::FloatParameter* bassParam = nullptr; + chowdsp::FloatParameter* trebleParam = nullptr; + chowdsp::FloatParameter* tFreqParam = nullptr; float dbScale = 1.0f; diff --git a/Plugin/Source/Processors/Input_Filters/InputFilters.cpp b/Plugin/Source/Processors/Input_Filters/InputFilters.cpp @@ -8,13 +8,14 @@ constexpr float maxFreq = 22000.0f; InputFilters::InputFilters (AudioProcessorValueTreeState& vts) { - lowCutParam = vts.getRawParameterValue ("ifilt_low"); - highCutParam = vts.getRawParameterValue ("ifilt_high"); + using namespace chowdsp::ParamUtils; + loadParameterPointer (lowCutParam, vts, "ifilt_low"); + loadParameterPointer (highCutParam, vts, "ifilt_high"); makeupParam = vts.getRawParameterValue ("ifilt_makeup"); onOffParam = vts.getRawParameterValue ("ifilt_onoff"); } -void InputFilters::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) +void InputFilters::createParameterLayout (chowdsp::Parameters& params) { NormalisableRange lowFreqRange { minFreq, 2000.0f }; lowFreqRange.setSkewForCentre (250.0f); @@ -22,7 +23,7 @@ void InputFilters::createParameterLayout (std::vector<std::unique_ptr<RangedAudi NormalisableRange highFreqRange { 2000.0f, maxFreq }; highFreqRange.setSkewForCentre (10000.0f); - auto freqToString = [] (float freq, int) -> String { + auto freqToString = [] (float freq) -> String { String suffix = " Hz"; if (freq > 1000.0f) { @@ -40,10 +41,11 @@ void InputFilters::createParameterLayout (std::vector<std::unique_ptr<RangedAudi return freq; }; - params.push_back (std::make_unique<AudioParameterBool> ("ifilt_onoff", "Input Filters On/Off", false)); - params.push_back (std::make_unique<AudioParameterFloat> ("ifilt_low", "Input Low Cut", lowFreqRange, minFreq, String(), AudioProcessorParameter::genericParameter, freqToString, stringToFreq)); - params.push_back (std::make_unique<AudioParameterFloat> ("ifilt_high", "Input High Cut", highFreqRange, maxFreq, String(), AudioProcessorParameter::genericParameter, freqToString, stringToFreq)); - params.push_back (std::make_unique<AudioParameterBool> ("ifilt_makeup", "Input Cut Makeup", false)); + using namespace chowdsp::ParamUtils; + emplace_param<chowdsp::BoolParameter> (params, "ifilt_onoff", "Input Filters On/Off", false); + emplace_param<chowdsp::FloatParameter> (params, "ifilt_low", "Input Low Cut", lowFreqRange, minFreq, freqToString, stringToFreq); + emplace_param<chowdsp::FloatParameter> (params, "ifilt_high", "Input High Cut", highFreqRange, maxFreq, freqToString, stringToFreq); + emplace_param<chowdsp::BoolParameter> (params, "ifilt_makeup", "Input Cut Makeup", false); } void InputFilters::prepareToPlay (double sampleRate, int samplesPerBlock, int numChannels) @@ -67,8 +69,8 @@ void InputFilters::processBlock (AudioBuffer<float>& buffer) if (! bypass.processBlockIn (buffer, bypass.toBool (onOffParam))) return; - lowCutFilter.setCutoff (lowCutParam->load()); - highCutFilter.setCutoff (jmin (highCutParam->load(), fs * 0.48f)); + lowCutFilter.setCutoff (lowCutParam->getCurrentValue()); + highCutFilter.setCutoff (jmin (highCutParam->getCurrentValue(), fs * 0.48f)); for (int ch = 0; ch < buffer.getNumChannels(); ++ch) { diff --git a/Plugin/Source/Processors/Input_Filters/InputFilters.h b/Plugin/Source/Processors/Input_Filters/InputFilters.h @@ -9,7 +9,7 @@ class InputFilters public: InputFilters (AudioProcessorValueTreeState& vts); - static void createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params); + static void createParameterLayout (chowdsp::Parameters& params); void prepareToPlay (double sampleRate, int samplesPerBlock, int numChannels); void setMakeupDelay (float newDelaySamples) { makeupDelay.setDelay (newDelaySamples); } @@ -18,8 +18,8 @@ public: private: std::atomic<float>* onOffParam = nullptr; - std::atomic<float>* lowCutParam = nullptr; - std::atomic<float>* highCutParam = nullptr; + chowdsp::FloatParameter* lowCutParam = nullptr; + chowdsp::FloatParameter* highCutParam = nullptr; std::atomic<float>* makeupParam = nullptr; float fs = 44100.0f; diff --git a/Plugin/Source/Processors/Loss_Effects/LossFilter.cpp b/Plugin/Source/Processors/Loss_Effects/LossFilter.cpp @@ -2,44 +2,25 @@ LossFilter::LossFilter (AudioProcessorValueTreeState& vts, int order) : order (order) { - speed = vts.getRawParameterValue ("speed"); - spacing = vts.getRawParameterValue ("spacing"); - thickness = vts.getRawParameterValue ("thick"); - gap = vts.getRawParameterValue ("gap"); + using namespace chowdsp::ParamUtils; + loadParameterPointer (speed, vts, "speed"); + loadParameterPointer (spacing, vts, "spacing"); + loadParameterPointer (thickness, vts, "thick"); + loadParameterPointer (gap, vts, "gap"); + loadParameterPointer (azimuth, vts, "azimuth"); onOff = vts.getRawParameterValue ("loss_onoff"); - azimuth = vts.getRawParameterValue ("azimuth"); } -void LossFilter::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) +void LossFilter::createParameterLayout (chowdsp::Parameters& params) { + using namespace chowdsp::ParamUtils; constexpr float minDist = 0.1f; - - auto valueToString = [] (float value, int) { return String (value, 4); }; - auto stringToValue = [] (const String& text) { return text.getFloatValue(); }; - - NormalisableRange<float> speedRange (1.0f, 50.0f); // meters per second - speedRange.setSkewForCentre (15.0f); - - NormalisableRange<float> spaceRange (minDist, 20.0f); - spaceRange.setSkewForCentre (10.0f); - - NormalisableRange<float> thickRange (minDist, 50.0f); - thickRange.setSkewForCentre (15.0f); - - NormalisableRange<float> gapRange (1.0f, 50.0f); - gapRange.setSkewForCentre (10.0f); - - params.push_back (std::make_unique<AudioParameterBool> ("loss_onoff", "Loss On/Off", true)); - - params.push_back (std::make_unique<AudioParameterFloat> ("speed", "Tape Speed", speedRange, 30.0f, String(), AudioProcessorParameter::genericParameter, [] (float value, int) { return String (value, 2); })); - - params.push_back (std::make_unique<AudioParameterFloat> ("spacing", "Tape Spacing", spaceRange, minDist, String(), AudioProcessorParameter::genericParameter, valueToString, stringToValue)); - - params.push_back (std::make_unique<AudioParameterFloat> ("thick", "Tape Thickness", thickRange, minDist, String(), AudioProcessorParameter::genericParameter, valueToString, stringToValue)); - - params.push_back (std::make_unique<AudioParameterFloat> ("gap", "Playhead Gap", gapRange, 1.0f, String(), AudioProcessorParameter::genericParameter, valueToString, stringToValue)); - - params.push_back (std::make_unique<AudioParameterFloat> ("azimuth", "Azimuth", -75.0f, 75.0f, 0.0f)); + emplace_param<chowdsp::BoolParameter> (params, "loss_onoff", "Loss On/Off", true); + emplace_param<chowdsp::FloatParameter> (params, "speed", "Tape Speed", createNormalisableRange (1.0f, 50.0f, 15.0f), 30.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "spacing", "Tape Spacing", createNormalisableRange (minDist, 20.0f, 10.0f), minDist, &floatValToStringDecimal<4>, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "thick", "Tape Thickness", createNormalisableRange (minDist, 50.0f, 15.0f), minDist, &floatValToStringDecimal<4>, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "gap", "Playhead Gap", createNormalisableRange (1.0f, 50.0f, 10.0f), 1.0, &floatValToStringDecimal<4>, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "azimuth", "Azimuth", NormalisableRange { -75.0f, 75.0f }, 0.0f, &floatValToString, &stringToFloatVal); } float LossFilter::getLatencySamples() const noexcept @@ -55,7 +36,7 @@ void LossFilter::prepare (float sampleRate, int samplesPerBlock, int numChannels fadeLength = jmax (1024, samplesPerBlock); fsFactor = (float) fs / 44100.0f; - curOrder = int (order * fsFactor); + curOrder = int ((float) order * fsFactor); currentCoefs.resize (curOrder); Hcoefs.resize (curOrder); @@ -190,7 +171,7 @@ void LossFilter::processBlock (AudioBuffer<float>& buffer) activeFilter = ! activeFilter; } - azimuthProc.setAzimuthAngle (azimuth->load(), speed->load()); + azimuthProc.setAzimuthAngle (azimuth->getCurrentValue(), speed->getCurrentValue()); azimuthProc.processBlock (buffer); bypass.processBlockOut (buffer, bypass.toBool (onOff)); diff --git a/Plugin/Source/Processors/Loss_Effects/LossFilter.h b/Plugin/Source/Processors/Loss_Effects/LossFilter.h @@ -11,9 +11,9 @@ public: LossFilter (AudioProcessorValueTreeState& vts, int order = 64); ~LossFilter() {} - static void createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params); + static void createParameterLayout (chowdsp::Parameters& params); - void prepare (float sampleRate, int samplesPerBlock, int numSamples); + void prepare (float sampleRate, int samplesPerBlock, int numChannels); void processBlock (AudioBuffer<float>& buffer); float getLatencySamples() const noexcept; @@ -31,11 +31,11 @@ private: AudioBuffer<float> fadeBuffer; std::atomic<float>* onOff = nullptr; - std::atomic<float>* speed = nullptr; - std::atomic<float>* spacing = nullptr; - std::atomic<float>* thickness = nullptr; - std::atomic<float>* gap = nullptr; - std::atomic<float>* azimuth = nullptr; + chowdsp::FloatParameter* speed = nullptr; + chowdsp::FloatParameter* spacing = nullptr; + chowdsp::FloatParameter* thickness = nullptr; + chowdsp::FloatParameter* gap = nullptr; + chowdsp::FloatParameter* azimuth = nullptr; float prevSpeed = 0.5f; float prevSpacing = 0.5f; diff --git a/Plugin/Source/Processors/MidSide/MidSideProcessor.cpp b/Plugin/Source/Processors/MidSide/MidSideProcessor.cpp @@ -9,16 +9,16 @@ MidSideProcessor::MidSideProcessor (AudioProcessorValueTreeState& vts) { // set up parameter handle here midSideParam = vts.getRawParameterValue ("mid_side"); - balanceParam = vts.getRawParameterValue ("stereo_balance"); + chowdsp::ParamUtils::loadParameterPointer (balanceParam, vts, "stereo_balance"); makeupParam = vts.getRawParameterValue ("stereo_makeup"); } -void MidSideProcessor::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) +void MidSideProcessor::createParameterLayout (chowdsp::Parameters& params) { using namespace chowdsp::ParamUtils; - params.push_back (std::make_unique<AudioParameterBool> ("mid_side", "Mid/Side Mode", false)); - params.push_back (std::make_unique<VTSParam> ("stereo_balance", "Stereo Balance", String(), NormalisableRange { -1.0f, 1.0f }, 0.0f, &percentValToString, &stringToPercentVal)); - params.push_back (std::make_unique<AudioParameterBool> ("stereo_makeup", "Stereo Makeup", true)); + emplace_param<chowdsp::BoolParameter> (params, "mid_side", "Mid/Side Mode", false); + emplace_param<chowdsp::FloatParameter> (params, "stereo_balance", "Stereo Balance", NormalisableRange { -1.0f, 1.0f }, 0.0f, &percentValToString, &stringToPercentVal); + emplace_param<chowdsp::BoolParameter> (params, "stereo_makeup", "Stereo Makeup", true); } void MidSideProcessor::prepare (double sampleRate, int samplesPerBlock) @@ -59,7 +59,7 @@ void MidSideProcessor::processInput (AudioBuffer<float>& buffer) } // balance processing - const auto curBalance = balanceParam->load(); + const auto curBalance = balanceParam->getCurrentValue(); auto&& stereoBlock = dsp::AudioBlock<float> { buffer }; auto&& leftBlock = stereoBlock.getSingleChannelBlock (0); auto&& rightBlock = stereoBlock.getSingleChannelBlock (1); @@ -85,7 +85,7 @@ void MidSideProcessor::processOutput (AudioBuffer<float>& buffer) // inverse balance processing if (*makeupParam == 1.0f) { - const auto curBalance = balanceParam->load(); + const auto curBalance = balanceParam->getCurrentValue(); auto&& stereoBlock = dsp::AudioBlock<float> { buffer }; auto&& leftBlock = stereoBlock.getSingleChannelBlock (0); auto&& rightBlock = stereoBlock.getSingleChannelBlock (1); diff --git a/Plugin/Source/Processors/MidSide/MidSideProcessor.h b/Plugin/Source/Processors/MidSide/MidSideProcessor.h @@ -7,7 +7,7 @@ class MidSideProcessor public: MidSideProcessor (AudioProcessorValueTreeState& vts); - static void createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params); + static void createParameterLayout (chowdsp::Parameters& params); void prepare (double sampleRate, int samplesPerBlock); @@ -16,7 +16,7 @@ public: private: std::atomic<float>* midSideParam = nullptr; // parameter handle - std::atomic<float>* balanceParam = nullptr; + chowdsp::FloatParameter* balanceParam = nullptr; std::atomic<float>* makeupParam = nullptr; bool curMS = false; diff --git a/Plugin/Source/Processors/Timing_Effects/WowFlutterProcessor.cpp b/Plugin/Source/Processors/Timing_Effects/WowFlutterProcessor.cpp @@ -3,14 +3,13 @@ WowFlutterProcessor::WowFlutterProcessor (AudioProcessorValueTreeState& vts) { - flutterRate = vts.getRawParameterValue ("rate"); - flutterDepth = vts.getRawParameterValue ("depth"); - - wowRate = vts.getRawParameterValue ("wow_rate"); - wowDepth = vts.getRawParameterValue ("wow_depth"); - wowVariance = vts.getRawParameterValue ("wow_var"); - wowDrift = vts.getRawParameterValue ("wow_drift"); - + using namespace chowdsp::ParamUtils; + loadParameterPointer (flutterRate, vts, "rate"); + loadParameterPointer (flutterDepth, vts, "depth"); + loadParameterPointer (wowRate, vts, "wow_rate"); + loadParameterPointer (wowDepth, vts, "wow_depth"); + loadParameterPointer (wowVariance, vts, "wow_var"); + loadParameterPointer (wowDrift, vts, "wow_drift"); flutterOnOff = vts.getRawParameterValue ("flutter_onoff"); } @@ -23,17 +22,16 @@ void WowFlutterProcessor::initialisePlots (foleys::MagicGUIState& magicState) magicState.addBackgroundProcessing (flutterPlot); } -void WowFlutterProcessor::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) +void WowFlutterProcessor::createParameterLayout (chowdsp::Parameters& params) { - params.push_back (std::make_unique<AudioParameterBool> ("flutter_onoff", "Wow/Flutter On/Off", true)); - - params.push_back (std::make_unique<AudioParameterFloat> ("rate", "Flutter Rate", 0.0f, 1.0f, 0.3f)); - params.push_back (std::make_unique<AudioParameterFloat> ("depth", "Flutter Depth", 0.0f, 1.0f, 0.0f)); - - params.push_back (std::make_unique<AudioParameterFloat> ("wow_rate", "Wow Rate", 0.0f, 1.0f, 0.25f)); - params.push_back (std::make_unique<AudioParameterFloat> ("wow_depth", "Wow Depth", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("wow_var", "Wow Variance", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("wow_drift", "Wow Drift", 0.0f, 1.0f, 0.0f)); + using namespace chowdsp::ParamUtils; + emplace_param<chowdsp::BoolParameter> (params, "flutter_onoff", "Wow/Flutter On/Off", true); + emplace_param<chowdsp::FloatParameter> (params, "rate", "Flutter Rate", NormalisableRange { 0.0f, 1.0f }, 0.3f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "depth", "Flutter Depth", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "wow_rate", "Wow Rate", NormalisableRange { 0.0f, 1.0f }, 0.25f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "wow_depth", "Wow Depth", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "wow_var", "Wow Variance", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); + emplace_param<chowdsp::FloatParameter> (params, "wow_drift", "Wow Drift", NormalisableRange { 0.0f, 1.0f }, 0.0f, &floatValToString, &stringToFloatVal); } void WowFlutterProcessor::prepareToPlay (double sampleRate, int samplesPerBlock, int numChannels) @@ -55,7 +53,7 @@ void WowFlutterProcessor::prepareToPlay (double sampleRate, int samplesPerBlock, flutterPlot->prepareToPlay (sampleRate, samplesPerBlock); } -void WowFlutterProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& /*midiMessages*/) +void WowFlutterProcessor::processBlock (AudioBuffer<float>& buffer) { ScopedNoDenormals noDenormals; @@ -64,7 +62,7 @@ void WowFlutterProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& auto curDepthWow = powf (*wowDepth, 3.0f); auto wowFreq = powf (4.5, *wowRate) - 1.0f; - wowProcessor.prepareBlock (curDepthWow, wowFreq, wowVariance->load(), wowDrift->load(), numSamples, numChannels); + wowProcessor.prepareBlock (curDepthWow, wowFreq, wowVariance->getCurrentValue(), wowDrift->getCurrentValue(), numSamples, numChannels); auto curDepthFlutter = powf (powf (*flutterDepth, 3.0f) * 81.0f / 625.0f, 0.5f); auto flutterFreq = 0.1f * powf (1000.0f, *flutterRate); diff --git a/Plugin/Source/Processors/Timing_Effects/WowFlutterProcessor.h b/Plugin/Source/Processors/Timing_Effects/WowFlutterProcessor.h @@ -12,22 +12,22 @@ public: WowFlutterProcessor (AudioProcessorValueTreeState& vts); void initialisePlots (foleys::MagicGUIState& magicState); - static void createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params); + static void createParameterLayout (chowdsp::Parameters& params); void prepareToPlay (double sampleRate, int samplesPerBlock, int numChannels); - void processBlock (AudioBuffer<float>&, MidiBuffer&); + void processBlock (AudioBuffer<float>&); private: void processWetBuffer (AudioBuffer<float>& buffer); void processBypassed (const AudioBuffer<float>& buffer); std::atomic<float>* flutterOnOff = nullptr; - std::atomic<float>* flutterRate = nullptr; - std::atomic<float>* flutterDepth = nullptr; - std::atomic<float>* wowRate = nullptr; - std::atomic<float>* wowDepth = nullptr; - std::atomic<float>* wowVariance = nullptr; - std::atomic<float>* wowDrift = nullptr; + chowdsp::FloatParameter* flutterRate = nullptr; + chowdsp::FloatParameter* flutterDepth = nullptr; + chowdsp::FloatParameter* wowRate = nullptr; + chowdsp::FloatParameter* wowDepth = nullptr; + chowdsp::FloatParameter* wowVariance = nullptr; + chowdsp::FloatParameter* wowDrift = nullptr; BypassProcessor bypass; float fs = 48000.0f; diff --git a/Plugin/modules/CMakeLists.txt b/Plugin/modules/CMakeLists.txt @@ -32,9 +32,11 @@ target_link_libraries(juce_plugin_modules chowdsp::chowdsp_plugin_base chowdsp::chowdsp_plugin_utils chowdsp::chowdsp_presets + chowdsp::chowdsp_clap_extensions chowdsp::chowdsp_foleys foleys_gui_magic RTNeural + clap_juce_extensions PUBLIC juce::juce_recommended_config_flags juce::juce_recommended_lto_flags