diff --git a/assets/disk0/COPYING b/assets/disk0/COPYING index a4a775b..9ab80f4 100644 --- a/assets/disk0/COPYING +++ b/assets/disk0/COPYING @@ -1,19 +1,14 @@ Copyright (c) 2020-2026 CuriousTorvald -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +You should have received a copy of the GNU General Public License +along with this program. If not, see . diff --git a/terranmon.txt b/terranmon.txt index 0e36167..23280ff 100644 --- a/terranmon.txt +++ b/terranmon.txt @@ -2868,7 +2868,18 @@ TODO: at execApp (:1457:16) at Object.execute (:893:38) at :867:31 - [ ] Timbres of Heaven's Overdriven Gt decays EXTREMELY SLOWLY even after the fix + [x] Timbres of Heaven's Overdriven Gt decays EXTREMELY SLOWLY even after the fix + * DONE 2026-06-15. Root cause (engine). Overdriven Gt becomes a 4-layer Metainstrument. + Layer children inherit the parent's key-off only via the per-tick background-voice sync + (AudioAdapter.kt:3782), which requires parent.active. With a fast fadeout (fo=1067 = 1-tick + cut), the foreground voice deactivates in the same tick KEY_OFF fires — before the sync runs — + so the children were detached as orphans that never picked up the release and kept looping at + the ~0.70 sustain until the next note. That's the "extremely slow decay"/ringing tail, and it's + ToH-specific because ToH leans on multi-layer presets with short releases. + Fix (AudioAdapter.kt, inactive-parent branch): inherit parent.keyOff/noteFading before + detaching, mirroring the existing active-branch. parent.keyOff survives deactivation and is + reset on retrigger, so a true value means this note was released. A parent that ended naturally + (no release) still leaves the child to finish on its own. [ ] Some ways to decouple Sample+Inst and patterns into separate files (tsvm-doom needs separate file access; samplepack can be uploaded once on init) TODO - list of demo songs that MUST ship with Microtone: diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/AudioAdapter.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/AudioAdapter.kt index 73d5b8a..10adc2b 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/AudioAdapter.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/AudioAdapter.kt @@ -3758,6 +3758,22 @@ class AudioAdapter(val vm: VM) : PeriBase(VM.PERITYPE_SOUND) { if (bg.isLayerChild) { val parent = ts.voices.getOrNull(bg.sourceChannel) if (parent == null || !parent.active) { + // Parent note ended: detach so this layer finishes its own release as a + // plain ghost. But if the parent was RELEASED (key-off / note-fade) and its + // own fadeout deactivated it in the SAME tick the release fired — a fast + // fadeout, e.g. fo≈1067 (a 1-tick cut) — the parent-sync below never ran + // while it was active, so the release was never carried across and a still + // looping/sustaining child would ring on until the next note displaces it. + // Inherit the parent's final release here before detaching (parent.keyOff / + // noteFading survive deactivation; both are reset on retrigger, so a true + // value means THIS note was released, not a stale flag). A parent that ended + // without release (natural sample/env end) leaves the child to finish on its + // own, unchanged. Symptom: long tails on multi-layer SF2 presets with a short + // release, e.g. Timbres of Heaven's sustained guitars/organs. + if (parent != null && !bg.keyOff && !bg.noteFading) { + if (parent.keyOff) { bg.keyOff = true; applyKeyLift(bg, instruments[bg.instrumentId]) } + else if (parent.noteFading) bg.noteFading = true + } bg.isLayerChild = false } else { bg.noteVal = (parent.noteVal + bg.layerRelDetune).coerceIn(0x20, 0xFFFF)