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

fix(audio): skip absent retry priorities

altic-dev3789b79ade18
diff --git a/Sources/Fluid/Services/ASRService.swift b/Sources/Fluid/Services/ASRService.swift
index 8924e693..1bdb0cd4 100644
--- a/Sources/Fluid/Services/ASRService.swift
+++ b/Sources/Fluid/Services/ASRService.swift
@@ -959,16 +959,18 @@ final class ASRService: ObservableObject {
if let forcingInputUID {
selectedInput = availableInputs.first { $0.uid == forcingInputUID }
} else {
+ let resolvedInput = self.resolvedInputDeviceForCapture(
+ availableInputs: availableInputs,
+ defaultInputUID: deviceSnapshot.defaultInputUID,
+ excluding: excludedInputUIDs
+ )
selectedInput = AudioCaptureIdlePolicy.bluetoothInputAwaitingAvailability(
priorityInputUIDs: SettingsStore.shared.microphonePriority.map(\.uid),
preferredInputUID: SettingsStore.shared.preferredInputDeviceUID,
+ resolvedInputUID: resolvedInput?.uid,
allDevices: allDevices,
excluding: excludedInputUIDs
- ) ?? self.resolvedInputDeviceForCapture(
- availableInputs: availableInputs,
- defaultInputUID: deviceSnapshot.defaultInputUID,
- excluding: excludedInputUIDs
- )
+ ) ?? resolvedInput
}
guard let attemptIdentity = AudioCaptureIdlePolicy.CaptureAttemptIdentity.resolve(
selectedInput: selectedInput,
diff --git a/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift b/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift
index 4f52dd6f..7a967387 100644
--- a/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift
+++ b/Sources/Fluid/Services/AudioCaptureIdlePolicy.swift
@@ -129,20 +129,28 @@ enum AudioCaptureIdlePolicy {
static func bluetoothInputAwaitingAvailability(
priorityInputUIDs: [String],
preferredInputUID: String?,
+ resolvedInputUID: String?,
allDevices: [AudioDevice.Device],
excluding excludedUIDs: Set<String>
) -> AudioDevice.Device? {
- let priorityUID = priorityInputUIDs.first { excludedUIDs.contains($0) == false }
- let candidateUID = priorityUID ?? preferredInputUID.flatMap { uid in
- excludedUIDs.contains(uid) ? nil : uid
+ func settlingBluetoothDevice(uid: String) -> AudioDevice.Device? {
+ guard let candidate = allDevices.first(where: { $0.uid == uid }),
+ candidate.isBluetooth,
+ candidate.hasInput == false,
+ candidate.isAlive
+ else { return nil }
+ return candidate
+ }
+
+ for uid in priorityInputUIDs where excludedUIDs.contains(uid) == false {
+ if uid == resolvedInputUID { return nil }
+ if let candidate = settlingBluetoothDevice(uid: uid) { return candidate }
}
- guard let candidateUID,
- let candidate = allDevices.first(where: { $0.uid == candidateUID }),
- candidate.isBluetooth,
- candidate.hasInput == false,
- candidate.isAlive
+ guard let preferredInputUID,
+ excludedUIDs.contains(preferredInputUID) == false,
+ preferredInputUID != resolvedInputUID
else { return nil }
- return candidate
+ return settlingBluetoothDevice(uid: preferredInputUID)
}
static func shouldPrewarmCapture(experimentalDirectAudioCaptureEnabled: Bool) -> Bool {
diff --git a/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift b/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift
index af3756c6..38b83136 100644
--- a/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift
+++ b/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift
@@ -737,6 +737,7 @@ final class HotkeyShortcutTests: XCTestCase {
let candidate = AudioCaptureIdlePolicy.bluetoothInputAwaitingAvailability(
priorityInputUIDs: ["airpods", "built-in"],
preferredInputUID: "airpods",
+ resolvedInputUID: "built-in",
allDevices: [airPodsOutputProfile],
excluding: []
)
@@ -763,6 +764,7 @@ final class HotkeyShortcutTests: XCTestCase {
let candidate = AudioCaptureIdlePolicy.bluetoothInputAwaitingAvailability(
priorityInputUIDs: ["built-in", "airpods"],
preferredInputUID: "built-in",
+ resolvedInputUID: "built-in",
allDevices: [builtIn, airPodsOutputProfile],
excluding: []
)
@@ -770,6 +772,27 @@ final class HotkeyShortcutTests: XCTestCase {
XCTAssertNil(candidate)
}
+ func testCaptureAttemptSkipsDisconnectedPriorityBeforeSettlingBluetoothInput() {
+ let airPodsOutputProfile = AudioDevice.Device(
+ id: 42,
+ uid: "airpods",
+ name: "AirPods",
+ hasInput: false,
+ hasOutput: true,
+ transportType: kAudioDeviceTransportTypeBluetooth
+ )
+
+ let candidate = AudioCaptureIdlePolicy.bluetoothInputAwaitingAvailability(
+ priorityInputUIDs: ["disconnected-usb", "airpods", "built-in"],
+ preferredInputUID: "disconnected-usb",
+ resolvedInputUID: "built-in",
+ allDevices: [airPodsOutputProfile],
+ excluding: []
+ )
+
+ XCTAssertEqual(candidate?.uid, "airpods")
+ }
+
func testBluetoothStartupPolicyDoesNotAffectOtherInputsOrActiveRecovery() {
var stabilization = AudioCaptureIdlePolicy.BluetoothInputStabilization()