3dtours/SonicForgeStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: _activeNotes lưu array channel cho mỗi key

Browse Source 
Cùng MIDI pitch 60, track 1→ch0, track 2→ch1 cùng key '0:60'
→ single value bị overwrite, stopNote chỉ stop 1 channel.
Fix: _activeNotes[key] = [ch1, ch2, ...], stopNote iterate all.
This commit is contained in:
3dtours
2026-07-27 16:00:11 +07:00
parent 838e173dd7
commit 16e33b2e6a
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/static/js/services/soundfontPlayer.js
+17 -5
View File
@@ -321,9 +321,15 @@
if (channel < 0 || channel > 15) return; if (channel < 0 || channel > 15) return;
if (_initialized && _fluidModule) { if (_initialized && _fluidModule) {
var key = channel + ':' + pitch; var key = channel + ':' + pitch;
var mappedCh = _activeNotes[key]; var mappedChs = _activeNotes[key];
console.log("[SonicSF] stopNote ch:", channel, "pitch:", pitch, "key:", key, "mappedCh:", mappedCh, "activeKeys:", Object.keys(_activeNotes)); if (mappedChs === undefined) {
if (mappedCh === undefined) mappedCh = channel; if (_activeNotes['_' + key]) mappedChs = _activeNotes['_' + key];
}
if (mappedChs === undefined) mappedChs = [channel];
if (!Array.isArray(mappedChs)) mappedChs = [mappedChs];
for (var i = 0; i < mappedChs.length; i++) {
try { _fluidModule._fluid_synth_noteoff(_synthPtr, mappedChs[i], pitch); } catch (e) {}
}
delete _activeNotes[key]; delete _activeNotes[key];
try { try {
var r1 = _fluidModule._fluid_synth_noteoff(_synthPtr, mappedCh, pitch); var r1 = _fluidModule._fluid_synth_noteoff(_synthPtr, mappedCh, pitch);
@@ -397,13 +403,19 @@
try { try {
console.log("[SonicSF] noteOn ch:", ch, "pitch:", midiPitch, "vel:", midiVel); console.log("[SonicSF] noteOn ch:", ch, "pitch:", midiPitch, "vel:", midiVel);
_fluidModule._fluid_synth_noteon(_synthPtr, ch, midiPitch, midiVel); _fluidModule._fluid_synth_noteon(_synthPtr, ch, midiPitch, midiVel);
_activeNotes[(_origChannel !== undefined ? _origChannel : 0) + ':' + midiPitch] = ch;
var noteMapKey = (_origChannel !== undefined ? _origChannel : 0) + ':' + midiPitch; var noteMapKey = (_origChannel !== undefined ? _origChannel : 0) + ':' + midiPitch;
if (!_activeNotes[noteMapKey]) _activeNotes[noteMapKey] = [];
if (_activeNotes[noteMapKey].indexOf(ch) === -1) _activeNotes[noteMapKey].push(ch);
if (durationMs > 0 && durationMs < 60000) { if (durationMs > 0 && durationMs < 60000) {
scheduledNote.off = setTimeout(function () { scheduledNote.off = setTimeout(function () {
try { try {
_fluidModule._fluid_synth_noteoff(_synthPtr, ch, midiPitch); _fluidModule._fluid_synth_noteoff(_synthPtr, ch, midiPitch);
delete _activeNotes[(_origChannel !== undefined ? _origChannel : 0) + ':' + midiPitch]; var arr = _activeNotes[noteMapKey];
if (arr) {
var idx = arr.indexOf(ch);
if (idx >= 0) arr.splice(idx, 1);
if (arr.length === 0) delete _activeNotes[noteMapKey];
}
} catch (e) {} } catch (e) {}
}, durSec * 1000); }, durSec * 1000);
} }