Skip to content

Commit

Permalink
Merge pull request #1624 from SynthstromAudible/cherry-pick-release/1…
Browse files Browse the repository at this point in the history
….1-58f6460780f39ce71b3ad3dd82bc7fe9b276f2c9
  • Loading branch information
m-m-adams authored Apr 1, 2024
2 parents 7e53867 + e1325b9 commit dfd9b21
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions src/deluge/gui/views/performance_session_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ using namespace deluge::modulation::params;
constexpr std::array<ParamsForPerformance, kNumParamsForPerformance> songParamsForPerformance = {{
{Kind::UNPATCHED_GLOBAL, UNPATCHED_LPF_FREQ, 8, 7, colours::red, colours::red.forTail()},
{Kind::UNPATCHED_GLOBAL, UNPATCHED_LPF_RES, 8, 6, colours::red, colours::red.forTail()},
{Kind::UNPATCHED_GLOBAL, UNPATCHED_LPF_MORPH, 8, 5, colours::red, colours::red.forTail()},
{Kind::UNPATCHED_GLOBAL, UNPATCHED_LPF_MORPH, 8, 4, colours::red, colours::red.forTail()},
{Kind::UNPATCHED_GLOBAL, UNPATCHED_HPF_FREQ, 9, 7, colours::pastel::orange, colours::pastel::orangeTail},
{Kind::UNPATCHED_GLOBAL, UNPATCHED_HPF_RES, 9, 6, colours::pastel::orange, colours::pastel::orangeTail},
{Kind::UNPATCHED_GLOBAL, UNPATCHED_HPF_MORPH, 9, 5, colours::pastel::orange, colours::pastel::orangeTail},
{Kind::UNPATCHED_GLOBAL, UNPATCHED_HPF_MORPH, 9, 4, colours::pastel::orange, colours::pastel::orangeTail},

{Kind::UNPATCHED_GLOBAL, UNPATCHED_BASS, 10, 6, colours::pastel::yellow, colours::pastel::yellow.forTail()},
{Kind::UNPATCHED_GLOBAL, UNPATCHED_TREBLE, 11, 6, colours::pastel::yellow, colours::pastel::yellow.forTail()},
Expand Down Expand Up @@ -123,9 +123,9 @@ constexpr Kind paramKindShortcutsForPerformanceView[kDisplayWidth][kDisplayHeigh
{Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::UNPATCHED_GLOBAL, Kind::UNPATCHED_GLOBAL,
Kind::NONE},
{Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE},
{Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::UNPATCHED_GLOBAL, Kind::UNPATCHED_GLOBAL,
{Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::UNPATCHED_GLOBAL, Kind::NONE, Kind::UNPATCHED_GLOBAL,
Kind::UNPATCHED_GLOBAL},
{Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::UNPATCHED_GLOBAL, Kind::UNPATCHED_GLOBAL,
{Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::UNPATCHED_GLOBAL, Kind::NONE, Kind::UNPATCHED_GLOBAL,
Kind::UNPATCHED_GLOBAL},
{Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::UNPATCHED_GLOBAL, Kind::NONE},
{Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::NONE, Kind::UNPATCHED_GLOBAL, Kind::NONE},
Expand All @@ -148,9 +148,9 @@ constexpr uint32_t paramIDShortcutsForPerformanceView[kDisplayWidth][kDisplayHei
{kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, UNPATCHED_SAMPLE_RATE_REDUCTION, UNPATCHED_BITCRUSHING,
kNoParamID},
{kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID},
{kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, UNPATCHED_LPF_MORPH, UNPATCHED_LPF_RES,
{kNoParamID, kNoParamID, kNoParamID, kNoParamID, UNPATCHED_LPF_MORPH, kNoParamID, UNPATCHED_LPF_RES,
UNPATCHED_LPF_FREQ},
{kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, UNPATCHED_HPF_MORPH, UNPATCHED_HPF_RES,
{kNoParamID, kNoParamID, kNoParamID, kNoParamID, UNPATCHED_HPF_MORPH, kNoParamID, UNPATCHED_HPF_RES,
UNPATCHED_HPF_FREQ},
{kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, UNPATCHED_BASS, kNoParamID},
{kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, kNoParamID, UNPATCHED_TREBLE, kNoParamID},
Expand Down
8 changes: 4 additions & 4 deletions src/deluge/modulation/params/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,11 @@ const uint32_t unpatchedGlobalParamShortcuts[kDisplayWidth][kDisplayHeight] = {
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , UNPATCHED_STUTTER_RATE},
{UNPATCHED_VOLUME , UNPATCHED_PITCH_ADJUST, kNoParamID , UNPATCHED_PAN , kNoParamID , UNPATCHED_SAMPLE_RATE_REDUCTION, UNPATCHED_BITCRUSHING , kNoParamID},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , UNPATCHED_LPF_MORPH , UNPATCHED_LPF_RES , UNPATCHED_LPF_FREQ},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , UNPATCHED_HPF_MORPH , UNPATCHED_HPF_RES , UNPATCHED_HPF_FREQ},
{kNoParamID , kNoParamID , UNPATCHED_SIDECHAIN_VOLUME, kNoParamID , UNPATCHED_SIDECHAIN_SHAPE , kNoParamID , UNPATCHED_BASS , UNPATCHED_BASS_FREQ},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , UNPATCHED_LPF_MORPH , kNoParamID , UNPATCHED_LPF_RES , UNPATCHED_LPF_FREQ},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , UNPATCHED_HPF_MORPH , kNoParamID , UNPATCHED_HPF_RES , UNPATCHED_HPF_FREQ},
{kNoParamID , kNoParamID , UNPATCHED_SIDECHAIN_VOLUME, kNoParamID , UNPATCHED_SIDECHAIN_SHAPE , kNoParamID , UNPATCHED_BASS , UNPATCHED_BASS_FREQ},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , UNPATCHED_TREBLE , UNPATCHED_TREBLE_FREQ},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , UNPATCHED_MOD_FX_OFFSET , UNPATCHED_MOD_FX_FEEDBACK , UNPATCHED_MOD_FX_DEPTH, UNPATCHED_MOD_FX_RATE},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , UNPATCHED_MOD_FX_OFFSET , UNPATCHED_MOD_FX_FEEDBACK , UNPATCHED_MOD_FX_DEPTH, UNPATCHED_MOD_FX_RATE},
{kNoParamID , kNoParamID , kNoParamID , UNPATCHED_REVERB_SEND_AMOUNT, kNoParamID , kNoParamID , kNoParamID , kNoParamID},
{UNPATCHED_DELAY_RATE, kNoParamID , kNoParamID , UNPATCHED_DELAY_AMOUNT , kNoParamID , kNoParamID , kNoParamID , kNoParamID},
{kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID , kNoParamID}};
Expand Down

0 comments on commit dfd9b21

Please sign in to comment.