add fallback color for scenes

YeonV · Oct 5, 2024 · a2cafac · a2cafac
1 parent 84e42d0
commit a2cafac
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/components/Midi/MidiListener.tsx b/src/components/Midi/MidiListener.tsx
@@ -20,6 +20,8 @@ const MIDIListener = () => {
   const toggleScenePLplay = useStore((state) => state.toggleScenePLplay)
   const [bright, setBright] = useState(1)
   const scenes = useStore((state) => state.scenes)
+  const midiSceneInactiveColor = useStore((state) => state.midiColors.sceneInactiveColor)
+  const midiSceneActiveColor = useStore((state) => state.midiColors.sceneActiveColor)
   const activateScene = useStore((state) => state.activateScene)
   const captivateScene = useStore((state) => state.captivateScene)
   const setSmartBarOpen = useStore(
@@ -235,7 +237,7 @@ const MIDIListener = () => {
         } else if (value.command === 'scene') {
           if (output && buttonNumber !== -1) {
             try {
-              output.send([parseInt(`0x${value.typeSceneInactive}`) || 0x90, buttonNumber, parseInt(value.colorSceneInactive, 16) || 60])
+              output.send([parseInt(`0x${value.typeSceneInactive}`) || 0x90, buttonNumber, parseInt(value.colorSceneInactive || midiSceneInactiveColor, 16) || 60])
             } catch (error) {
               console.error('Error sending MIDI message:', error)
             }
@@ -252,15 +254,15 @@ const MIDIListener = () => {
             if (key === scene_id) {
               if (output && buttonNumber !== -1) {
                 if (!Number.isNaN(buttonNumber)) {
-                  output.send([parseInt(`0x${midiMapping[0][buttonNumber]?.typeSceneActive}`) || 0x90, buttonNumber, parseInt(midiMapping[0][buttonNumber]?.colorSceneActive || '1E', 16)])
+                  output.send([parseInt(`0x${midiMapping[0][buttonNumber]?.typeSceneActive}`) || 0x90, buttonNumber, parseInt(midiMapping[0][buttonNumber]?.colorSceneActive || midiSceneActiveColor || '1E', 16)])
                 }
               } else {
                 console.error('No MIDI output devices found')
               }
             } else {
               if (output && buttonNumber !== -1) {
                 if (!Number.isNaN(buttonNumber)) {
-                  output.send([parseInt(`0x${midiMapping[0][buttonNumber]?.typeSceneInactive}`) || 0x90, buttonNumber, parseInt(midiMapping[0][buttonNumber]?.colorSceneInactive || '3C', 16)])
+                  output.send([parseInt(`0x${midiMapping[0][buttonNumber]?.typeSceneInactive}`) || 0x90, buttonNumber, parseInt(midiMapping[0][buttonNumber]?.colorSceneInactive || midiSceneInactiveColor || '3C', 16)])
                 }
               } else {
                 console.error('No MIDI output devices found')