fix: Robust trigger mode switching and voice choking

Author: acidsound

components/WaveformEditor.tsx

@@ -11,7 +11,7 @@ interface WaveformEditorProps {
 }
 
 export const WaveformEditor: React.FC<WaveformEditorProps> = ({ isUltraSampleMode = false }) => {
-  const { currentChannel, selectedPadId, pads, samples, updatePad, stopPad, setAppMode, setRecordingModalOpen } = usePadStore();
+  const { currentChannel, selectedPadId, pads, samples, updatePad, stopPadExplicit, setAppMode, setRecordingModalOpen } = usePadStore();
   const { audioContext, micAnalyser, isRecording } = useAudioStore();
   const { setBpm } = useSequencerStore();
   const selectedPadIndex = parseInt(selectedPadId.split('-')[1]);
@@ -456,9 +456,8 @@ export const WaveformEditor: React.FC<WaveformEditorProps> = ({ isUltraSampleMod
   };
 
   const setTriggerMode = (mode: TriggerMode) => {
-    if (activePad?.triggerMode === 'ONE_SHOT' && mode !== 'ONE_SHOT') {
-      stopPad(selectedPadIndex);
-    }
+    // Force stop all voices and clear UI state when switching trigger modes
+    stopPadExplicit(selectedPadIndex);
     updatePad(selectedPadIndex, { triggerMode: mode });
   };
 

public/assets/worklets/VoiceProcessor.js

@@ -23,6 +23,9 @@ class VoiceProcessor extends AudioWorkletProcessor {
         case 'RELEASE_PAD':
           this.releaseVoice(data.padId, data.startTime);
           break;
+        case 'STOP_PAD':
+          this.stopPadVoices(data.padId, data.startTime);
+          break;
         case 'UPDATE_PAD_START_END':
           this.updateVoiceBoundaries(data);
           break;
@@ -107,16 +110,13 @@ class VoiceProcessor extends AudioWorkletProcessor {
     // For GATE and LOOP modes, we enforce monophonic behavior per pad (Choke Group).
     // If a pad is re-triggered, the existing voice must stop with a very fast fade (5ms)
     // to avoid overlaps and digital clicks.
-    if (triggerMode === 'GATE' || triggerMode === 'LOOP') {
-      for (const voice of this.voices) {
-        if (voice.padId === padId && !voice.finished) {
-          voice.envelope.phase = 'release';
-          voice.envelope.releaseT = 0;
-          voice.envelope.release = 0.005; // 5ms forced release
-        }
+    // Every pad is monophonic (choke previous voice of same pad)
+    for (const voice of this.voices) {
+      if (voice.padId === padId && !voice.finished) {
+        voice.envelope.phase = 'release';
+        voice.envelope.releaseT = 0;
+        voice.envelope.release = 0.005; // 5ms forced release to avoid clicks
       }
-    } else {
-      this.releaseVoice(padId);
     }
 
     if (this.voices.length >= 32) {
@@ -175,13 +175,30 @@ class VoiceProcessor extends AudioWorkletProcessor {
 
     for (const voice of this.voices) {
       if (voice.padId === padId && !voice.finished && voice.envelope.phase !== 'release') {
+        // Standard release (e.g. key up) only affects GATE and LOOP
         if (voice.triggerMode === 'GATE' || voice.triggerMode === 'LOOP') {
           voice.releaseAtFrame = releaseAtFrame;
         }
       }
     }
   }
 
+  stopPadVoices(padId, startTime) {
+    const sr = sampleRate || 44100;
+    const releaseAtFrame = startTime !== undefined ? Math.floor(startTime * sr) : currentFrame;
+
+    for (const voice of this.voices) {
+      if (voice.padId === padId && !voice.finished) {
+        // Forced release (STOP) affects all modes
+        voice.envelope.phase = 'release';
+        voice.envelope.releaseT = 0;
+        voice.envelope.release = 0.005; // Fast 5ms fade
+        voice.envelope.levelAtRelease = voice.envelope.levelAtRelease || 0.5;
+        voice.releaseAtFrame = undefined; // Process immediately
+      }
+    }
+  }
+
   process(inputs, outputs, parameters) {
     const output = outputs[0];
     const channelL = output[0];

stores/audioStore.ts

@@ -23,6 +23,7 @@ interface AudioState {
   removeSampleFromWorklet: (id: string) => void;
   triggerPad: (data: any) => void;
   stopPad: (padId: string, startTime?: number) => void;
+  stopPadExplicit: (padId: string) => void;
   updatePadStartEnd: (padId: string, start: number, end: number) => void;
   updatePadParams: (padId: string, params: { cutoff?: number, resonance?: number, pitch?: number, volume?: number, pan?: number, mute?: boolean }) => void;
   stopAll: () => void;
@@ -160,6 +161,16 @@ export const useAudioStore = create<AudioState>((set, get) => ({
     }
   },
 
+  stopPadExplicit: (padId: string) => {
+    const { workletNode } = get();
+    if (workletNode) {
+      workletNode.port.postMessage({
+        type: 'STOP_PAD',
+        data: { padId }
+      });
+    }
+  },
+
   updatePadStartEnd: (padId: string, start: number, end: number) => {
     const { workletNode } = get();
     if (workletNode) {

stores/padStore.ts

@@ -23,6 +23,7 @@ interface PadState {
   loadSample: (index: number, url: string, name: string) => Promise<void>;
   triggerPad: (index: number, velocity?: number, pitchOverrideMultiplier?: number, startTime?: number, channelId?: ChannelId) => void;
   stopPad: (index: number, startTime?: number, channelId?: ChannelId) => void;
+  stopPadExplicit: (index: number, channelId?: ChannelId) => void;
   toggleMute: (index: number) => void;
   toggleSolo: (index: number) => void;
   syncMuteStates: () => void;
@@ -452,6 +453,28 @@ export const usePadStore = create<PadState>((set, get) => ({
     useAudioStore.getState().stopPad(id, startTime);
   },
 
+  stopPadExplicit: (index: number, channelId?: ChannelId) => {
+    const { pads, currentChannel } = get();
+    const effectiveChannel = channelId || currentChannel;
+    const id = `${effectiveChannel}-${index}`;
+    const pad = pads[id];
+    if (pad) {
+      set(state => ({
+        pads: {
+          ...state.pads,
+          [id]: {
+            ...pad,
+            isHeld: false,
+            lastTriggerTime: undefined,
+            lastTriggerDuration: undefined,
+            lastStopTime: undefined
+          }
+        }
+      }));
+    }
+    useAudioStore.getState().stopPadExplicit(id);
+  },
+
   loadSamplePack: async (packId) => {
     set({ currentSamplePackId: packId });
     await dbService.saveMetadata('current_sample_pack_id', packId);