Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

Limit direct recovery to preferred input changes

Ashwanthrambcc85ca4eaa2
diff --git a/Sources/Fluid/Services/ASRService.swift b/Sources/Fluid/Services/ASRService.swift
index 98ccdb7a..f7de72c5 100644
--- a/Sources/Fluid/Services/ASRService.swift
+++ b/Sources/Fluid/Services/ASRService.swift
@@ -3255,11 +3255,12 @@ final class ASRService: ObservableObject {
DispatchQueue.main.async { [weak self] in
guard let self else { return }
let cachedUIDs = self.cachedDeviceUIDs
+ let currentUIDs = Set(currentDevices.map(\.uid))
DebugLogger.shared.debug("Current input devices: \(currentDevices.map { $0.name }.joined(separator: ", "))", source: "ASRService")
if SettingsStore.shared.microphoneSelectionMode == .manual,
- Set(currentDevices.map(\.uid)) != cachedUIDs
+ currentUIDs != cachedUIDs
{
if AudioCaptureIdlePolicy.shouldEnforceSystemPreferredInput(
experimentalDirectAudioCaptureEnabled: SettingsStore.shared.experimentalDirectAudioCaptureEnabled
@@ -3267,9 +3268,13 @@ final class ASRService: ObservableObject {
AppServices.shared.microphonePreferenceCoordinator.stabilizePreferredInputAfterHardwareChange(
reason: "input device list changed"
)
- } else {
+ } else if AudioCaptureIdlePolicy.didPreferredInputAvailabilityChange(
+ preferredInputUID: SettingsStore.shared.preferredInputDeviceUID,
+ previousInputUIDs: cachedUIDs,
+ currentInputUIDs: currentUIDs
+ ) {
self.scheduleAudioRouteRecovery(
- reason: "direct input device list changed",
+ reason: "direct preferred input availability changed",
requiresIdlePrewarm: true
)
}
diff --git a/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift b/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift
index 8dfa1029..0f00eb71 100644
--- a/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift
+++ b/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift
@@ -9,6 +9,15 @@ enum AudioCaptureIdlePolicy {
experimentalDirectAudioCaptureEnabled == false
}
+ static func didPreferredInputAvailabilityChange(
+ preferredInputUID: String?,
+ previousInputUIDs: Set<String>,
+ currentInputUIDs: Set<String>
+ ) -> Bool {
+ guard let preferredInputUID, preferredInputUID.isEmpty == false else { return false }
+ return previousInputUIDs.contains(preferredInputUID) != currentInputUIDs.contains(preferredInputUID)
+ }
+
static func shouldRecoverEngineConfigurationChange(
isRunning: Bool,
isStarting: Bool
diff --git a/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift b/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift
index aadfb2fb..0ebe1747 100644
--- a/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift
+++ b/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift
@@ -182,6 +182,26 @@ final class HotkeyShortcutTests: XCTestCase {
))
}
+ func testDirectRecoveryTracksOnlyPreferredInputAvailability() {
+ let previousUIDs = Set(["preferred", "built-in"])
+
+ XCTAssertFalse(AudioCaptureIdlePolicy.didPreferredInputAvailabilityChange(
+ preferredInputUID: "preferred",
+ previousInputUIDs: previousUIDs,
+ currentInputUIDs: previousUIDs.union(["unrelated"])
+ ))
+ XCTAssertTrue(AudioCaptureIdlePolicy.didPreferredInputAvailabilityChange(
+ preferredInputUID: "preferred",
+ previousInputUIDs: previousUIDs,
+ currentInputUIDs: ["built-in"]
+ ))
+ XCTAssertTrue(AudioCaptureIdlePolicy.didPreferredInputAvailabilityChange(
+ preferredInputUID: "preferred",
+ previousInputUIDs: ["built-in"],
+ currentInputUIDs: previousUIDs
+ ))
+ }
+
func testEngineConfigurationChangesRecoverOnlyDuringCaptureTransitions() {
XCTAssertFalse(AudioCaptureIdlePolicy.shouldRecoverEngineConfigurationChange(
isRunning: false,