Skip to content

Commit

Permalink
Remove patch param sidechain level (SynthstromAudible#2094)
Browse files Browse the repository at this point in the history
Removed patched param sidechain level from automation view synths and kit rows because sidechain for synths and kit rows is a patch cable (Sidechain -> Sidechain Level) and this Sidechain Level param was never previously exposed.

Also fixed a bug with parameter selection on the automation overview which prevented selecting the params sidechain shape and sidechain level for global params (audio clips and kit affect entire)
  • Loading branch information
seangoodvibes committed Jun 5, 2024
1 parent 9ecc6bf commit 2fc6d00
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions docs/features/automation_view.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ Automatable Parameters are broken down into four categories for Automation View

1. Automatable Clip View Parameters for Synths and Kits with a row selected and affect entire DISABLED

>The 61 parameters that can be edited are:
>The 60 parameters that can be edited are:
>
> - **Master** Level, Pitch, Pan
> - **LPF** Frequency, Resonance, Morph
> - **HPF** Frequency, Resonance, Morph
> - **EQ** Bass, Bass Frequency, Treble, Treble Frequency
> - **Reverb** Amount
> - **Delay** Rate, Amount
> - **Sidechain** Level, Shape
> - **Sidechain** Shape
> - **Distortion** Decimation, Bitcrush, Wavefolder
> - **OSC 1** Level, Pitch, Phase Width, Carrier Feedback, Wave Position
> - **OSC 2** Level, Pitch, Phase Width, Carrier Feedback, Wave Position
Expand Down
10 changes: 5 additions & 5 deletions src/deluge/gui/views/automation_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const uint32_t mutePadActionUIModes[] = {UI_MODE_NOTES_PRESSED, UI_MODE_AUDITION

const uint32_t verticalScrollUIModes[] = {UI_MODE_NOTES_PRESSED, UI_MODE_AUDITIONING, UI_MODE_RECORD_COUNT_IN, 0};

constexpr int32_t kNumNonGlobalParamsForAutomation = 61;
constexpr int32_t kNumNonGlobalParamsForAutomation = 60;
constexpr int32_t kNumGlobalParamsForAutomation = 26;
constexpr int32_t kParamNodeWidth = 3;

Expand Down Expand Up @@ -147,8 +147,7 @@ const std::array<std::pair<params::Kind, ParamType>, kNumNonGlobalParamsForAutom
// Delay Rate, Amount
{params::Kind::PATCHED, params::GLOBAL_DELAY_RATE},
{params::Kind::PATCHED, params::GLOBAL_DELAY_FEEDBACK},
// Sidechain Send, Shape
{params::Kind::PATCHED, params::GLOBAL_VOLUME_POST_REVERB_SEND},
// Sidechain Shape
{params::Kind::UNPATCHED_SOUND, params::UNPATCHED_SIDECHAIN_SHAPE},
// Decimation, Bitcrush, Wavefolder
{params::Kind::UNPATCHED_SOUND, params::UNPATCHED_SAMPLE_RATE_REDUCTION},
Expand Down Expand Up @@ -2136,8 +2135,9 @@ void AutomationView::handleParameterSelection(Clip* clip, OutputType outputType,
int32_t paramID = unpatchedGlobalParamShortcuts[xDisplay][yDisplay];

// don't allow automation of pitch adjust, or sidechain in arranger
if (onArrangerView && (paramID == params::UNPATCHED_PITCH_ADJUST)
|| (paramID == params::UNPATCHED_SIDECHAIN_SHAPE) || (paramID == params::UNPATCHED_SIDECHAIN_VOLUME)) {
if (onArrangerView
&& ((paramID == params::UNPATCHED_PITCH_ADJUST) || (paramID == params::UNPATCHED_SIDECHAIN_SHAPE)
|| (paramID == params::UNPATCHED_SIDECHAIN_VOLUME))) {
return; // no parameter selected, don't re-render grid;
}

Expand Down
2 changes: 1 addition & 1 deletion src/deluge/modulation/params/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ const uint32_t patchedParamShortcuts[kDisplayWidth][kDisplayHeight] = {
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , LOCAL_FOLD},
{LOCAL_ENV_0_RELEASE , LOCAL_ENV_0_SUSTAIN , LOCAL_ENV_0_DECAY , LOCAL_ENV_0_ATTACK , LOCAL_LPF_MORPH, kNoParamID , LOCAL_LPF_RESONANCE , LOCAL_LPF_FREQ},
{LOCAL_ENV_1_RELEASE , LOCAL_ENV_1_SUSTAIN , LOCAL_ENV_1_DECAY , LOCAL_ENV_1_ATTACK , LOCAL_HPF_MORPH, kNoParamID , LOCAL_HPF_RESONANCE , LOCAL_HPF_FREQ},
{kNoParamID , kNoParamID , GLOBAL_VOLUME_POST_REVERB_SEND, kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID},
{GLOBAL_ARP_RATE , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID},
{GLOBAL_LFO_FREQ , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , GLOBAL_MOD_FX_DEPTH , GLOBAL_MOD_FX_RATE},
{LOCAL_LFO_LOCAL_FREQ , kNoParamID , kNoParamID , GLOBAL_REVERB_AMOUNT , kNoParamID , kNoParamID , kNoParamID , kNoParamID},
Expand Down

0 comments on commit 2fc6d00

Please sign in to comment.