From e1325b91e1cdbcf47b81c0646fdf48587c70aae2 Mon Sep 17 00:00:00 2001 From: Sean Ditny <138174805+seangoodvibes@users.noreply.github.com> Date: Sun, 31 Mar 2024 15:30:39 -0400 Subject: [PATCH] Associate Global LPF/HPF Morph With the Right Grid Shortcut (#1598) Bug fix - associated new global lpf/hpf params with the wrong grid shortcut. --- src/deluge/gui/views/performance_session_view.cpp | 12 ++++++------ src/deluge/modulation/params/param.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/deluge/gui/views/performance_session_view.cpp b/src/deluge/gui/views/performance_session_view.cpp index b0b78968af..b9d44ba6f6 100644 --- a/src/deluge/gui/views/performance_session_view.cpp +++ b/src/deluge/gui/views/performance_session_view.cpp @@ -72,10 +72,10 @@ using namespace deluge::modulation::params; constexpr std::array 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()}, @@ -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}, @@ -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}, diff --git a/src/deluge/modulation/params/param.h b/src/deluge/modulation/params/param.h index d7a9d0e659..e9c38ad347 100644 --- a/src/deluge/modulation/params/param.h +++ b/src/deluge/modulation/params/param.h @@ -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}};