MIDI Input: Fix scene trigger if multiple events detected

YeonV · Oct 3, 2024 · 0564901 · 0564901
1 parent e09ed4f
commit 0564901
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/components/Dialogs/SceneDialogs/EditSceneDialog.tsx b/src/components/Dialogs/SceneDialogs/EditSceneDialog.tsx
@@ -76,6 +76,7 @@ const EditSceneDialog = () => {
   const getUserPresets = useStore((state) => state.getUserPresets)
   const getImage = useStore((state) => state.getImage)
   const [imageData, setImageData] = useState(null)
+  const midiInput = useStore((state) => state.midiInput)
 
   const getFullConfig = useStore((state) => state.getFullConfig)
 
@@ -237,14 +238,15 @@ const EditSceneDialog = () => {
           if (err) {
             console.error('WebMidi could not be enabled:', err)
           } else {
-            // Get all input devices
             const { inputs } = WebMidi
             if (inputs.length > 0) {
-              // Listen for MIDI messages on all channels and all input devices
-              inputs.forEach((input: Input) =>
-                input.addListener('noteon', (event: NoteMessageEvent) => {
-                  handleMidiEvent(input, event)
-                })
+              inputs.forEach((input: Input) => {
+                if (midiInput === input.name) {
+                  return input.addListener('noteon', (event: NoteMessageEvent) => {
+                    handleMidiEvent(input, event)
+                  })
+                }
+              }
               )
             }
           }

diff --git a/src/components/Midi/MidiListener.tsx b/src/components/Midi/MidiListener.tsx
@@ -90,10 +90,13 @@ const MIDIListener = () => {
   useEffect(() => {
     const handleMidiInput = (input: Input) => {
       if (!input || input.name !== midiInput) return  
+      // console.log('Input Name:', input.name)
       input.removeListener('noteon')
       input.removeListener('noteoff')
       input.addListener('noteon', (event: any) => {
         if (!event.note || (midiEvent.button === event.note.number && midiEvent.name === input.name && midiEvent.note === event.note.identifier)) return
+        // console.log('Input Name:', input.name)
+        // console.log('MIDI Event:', event)
         setMidiEvent({
           name: input.name,
           note: event.note.identifier,
@@ -105,6 +108,7 @@ const MIDIListener = () => {
       })
 
       input.addListener('noteoff', (event: any) => {
+        // console.log('MIDI Event:', event)
         if (midiMapping[0][event.note.number]?.command === 'one-shot' && midiMapping[0][event.note.number]?.payload?.holdType === 'release') {
           oneShotAll(
             midiMapping[0][event.note.number]?.payload?.color || '#0dbedc',
@@ -121,6 +125,7 @@ const MIDIListener = () => {
         })
       })
       input.addListener('controlchange', (event: any) => {
+        // console.log('MIDI Event:', event)
         if (event.controller.number === midiEvent.button && midiEvent.name === input.name) return
         if (event.value === 1) {
           setMidiEvent({