Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improvement: improve audio input restauration mechanism

This commit is contained in:
Alex P 2025-09-21 17:41:12 +00:00
parent dec0b9d3db
commit 093f2bbe22
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ui/src/hooks/useMicrophone.ts
View File

@ -33,9 +33,6 @@ export function useMicrophone() {
const { usbDeviceConfig } = useUsbDeviceConfig(); const { usbDeviceConfig } = useUsbDeviceConfig();
const isUsbAudioEnabled = usbDeviceConfig?.audio ?? true; const isUsbAudioEnabled = usbDeviceConfig?.audio ?? true;
// Track microphone state when USB audio gets disabled, so we can restore it when re-enabled
const [microphoneWasActiveBeforeUsbDisable, setMicrophoneWasActiveBeforeUsbDisable] = useState<boolean>(false);
// RPC helper functions to replace HTTP API calls // RPC helper functions to replace HTTP API calls
const rpcMicrophoneStart = useCallback((): Promise<void> => { const rpcMicrophoneStart = useCallback((): Promise<void> => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -597,30 +594,32 @@ export function useMicrophone() {
// Handle audio device changes (USB audio enable/disable) via WebSocket events // Handle audio device changes (USB audio enable/disable) via WebSocket events
const handleAudioDeviceChanged = useCallback((data: AudioDeviceChangedData) => { const handleAudioDeviceChanged = useCallback((data: AudioDeviceChangedData) => {
devInfo("Audio device changed:", data); devInfo("Audio device changed:", data);
devInfo("Current microphone state:", { isMicrophoneActive, microphoneWasEnabled });
// USB audio was just disabled // USB audio was just disabled
if (!data.enabled && data.reason === "usb_reconfiguration") { if (!data.enabled && data.reason === "usb_reconfiguration") {
devInfo("USB audio disabled via device change event - storing microphone state"); devInfo(`USB audio disabled via device change event - microphone was ${isMicrophoneActive ? 'active' : 'inactive'}`);
setMicrophoneWasActiveBeforeUsbDisable(isMicrophoneActive);
// Clear the enabled flag to prevent auto-restore attempts // The microphoneWasEnabled flag is already being managed by the microphone start/stop functions
if (isMicrophoneActive) { // We don't need to do anything special here - it will be preserved for restoration
setMicrophoneWasEnabled(false); devInfo(`Current microphoneWasEnabled flag: ${microphoneWasEnabled}`);
}
} }
// USB audio was just re-enabled // USB audio was just re-enabled
else if (data.enabled && data.reason === "usb_reconfiguration") { else if (data.enabled && data.reason === "usb_reconfiguration") {
devInfo("USB audio re-enabled via device change event - checking if microphone should be restored"); devInfo("USB audio re-enabled via device change event - checking if microphone should be restored");
devInfo(`microphoneWasEnabled: ${microphoneWasEnabled}`);
devInfo(`Current microphone active: ${isMicrophoneActive}`);
devInfo(`RPC ready: ${rpcDataChannel?.readyState === "open"}`);
// If microphone was active before USB was disabled, restore it // If microphone was enabled before (using the same logic as page reload restore), restore it
if (microphoneWasActiveBeforeUsbDisable && !isMicrophoneActive && rpcDataChannel?.readyState === "open") { if (microphoneWasEnabled && !isMicrophoneActive && rpcDataChannel?.readyState === "open") {
devInfo("Restoring microphone after USB audio re-enabled"); devInfo("Restoring microphone after USB audio re-enabled (using microphoneWasEnabled flag)");
setTimeout(async () => { setTimeout(async () => {
try { try {
const result = await startMicrophone(); const result = await startMicrophone();
if (result.success) { if (result.success) {
devInfo("Microphone successfully restored after USB audio re-enable"); devInfo("Microphone successfully restored after USB audio re-enable");
setMicrophoneWasEnabled(true);
} else { } else {
devWarn("Failed to restore microphone after USB audio re-enable:", result.error); devWarn("Failed to restore microphone after USB audio re-enable:", result.error);
} }
@ -628,12 +627,11 @@ export function useMicrophone() {
devWarn("Error restoring microphone after USB audio re-enable:", error); devWarn("Error restoring microphone after USB audio re-enable:", error);
} }
}, 500); // Small delay to ensure USB device reconfiguration is complete }, 500); // Small delay to ensure USB device reconfiguration is complete
} else {
devInfo("Not restoring microphone - conditions not met or microphone was not previously enabled");
} }
// Clear the stored state
setMicrophoneWasActiveBeforeUsbDisable(false);
} }
}, [isMicrophoneActive, microphoneWasActiveBeforeUsbDisable, startMicrophone, setMicrophoneWasEnabled, rpcDataChannel?.readyState]); }, [isMicrophoneActive, microphoneWasEnabled, startMicrophone, rpcDataChannel?.readyState]);
// Subscribe to audio device change events // Subscribe to audio device change events
useAudioEvents(handleAudioDeviceChanged); useAudioEvents(handleAudioDeviceChanged);