From 7284cfc1ab9a9ed362b08a767f037ca3d371f84a Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sun, 28 Dec 2025 16:22:24 -0600 Subject: [PATCH] checkpoint --- src/ParameterStore.h | 4 ++-- src/synth/Envelope.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ParameterStore.h b/src/ParameterStore.h index d3db1f9..07eb532 100644 --- a/src/ParameterStore.h +++ b/src/ParameterStore.h @@ -49,8 +49,8 @@ constexpr std::array(EnvelopeId::Count)> ENV_ { ParamId::Osc1VolumeEnvA, ParamId::Osc1VolumeEnvD, ParamId::Osc1VolumeEnvS, ParamId::Osc1VolumeEnvR }, // Osc1Volume { ParamId::Osc1VolumeEnvA, ParamId::Osc1VolumeEnvD, ParamId::Osc1VolumeEnvS, ParamId::Osc1VolumeEnvR }, // Osc2Volume (not implemented) { ParamId::Osc1VolumeEnvA, ParamId::Osc1VolumeEnvD, ParamId::Osc1VolumeEnvS, ParamId::Osc1VolumeEnvR }, // Osc3Volume (not implemented) - { ParamId::FilterCutoffEnvA, ParamId::FilterCutoffEnvR, ParamId::FilterCutoffEnvS, ParamId::FilterCutoffEnvR }, // FilterCutoff - { ParamId::FilterResonanceEnvA, ParamId::FilterResonanceEnvR, ParamId::FilterResonanceEnvS, ParamId::FilterResonanceEnvR }, // FilterResonance + { ParamId::FilterCutoffEnvA, ParamId::FilterCutoffEnvD, ParamId::FilterCutoffEnvS, ParamId::FilterCutoffEnvR }, // FilterCutoff + { ParamId::FilterResonanceEnvA, ParamId::FilterResonanceEnvD, ParamId::FilterResonanceEnvS, ParamId::FilterResonanceEnvR }, // FilterResonance }}; struct ParamDefault { diff --git a/src/synth/Envelope.cpp b/src/synth/Envelope.cpp index 5db79b0..617e60a 100644 --- a/src/synth/Envelope.cpp +++ b/src/synth/Envelope.cpp @@ -27,7 +27,7 @@ float Envelope::process() { state_ = State::Decay; } break; - case State::Decay: + case State::Decay: // TODO: noteOff during decay means release occurs longer than expected value_ -= (1.0f - sustain_) / (decay_ * sampleRate_); if(value_ <= sustain_) { value_ = sustain_;