Merge pull request #390 from james-pellow/darwin-fixes

Darwin fixes
llfbandit · Aug 27, 2024 · 97f4032 · 97f4032
2 parents aebeac5 + 04b478b
commit 97f4032
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/record_darwin/CHANGELOG.md b/record_darwin/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.3
+* fix: Exception where format.sampleRate != hwFormat.sampleRate
+* feat(macOS): Support device by deviceID as well as deviceUID
+
 ## 1.1.2
 * fix: Remove print on conversion error.
 

diff --git a/record_darwin/darwin/Classes/delegate/RecorderStreamDelegate.swift b/record_darwin/darwin/Classes/delegate/RecorderStreamDelegate.swift
@@ -27,7 +27,7 @@ class RecorderStreamDelegate: NSObject, AudioRecordingStreamDelegate {
     }
 #endif
 
-    let srcFormat = audioEngine.inputNode.outputFormat(forBus: 0)
+    let srcFormat = audioEngine.inputNode.inputFormat(forBus: 0)
 
     let dstFormat = AVAudioFormat(
       commonFormat: .pcmFormatInt16,

diff --git a/record_darwin/macos/Classes/RecorderMacOS.swift b/record_darwin/macos/Classes/RecorderMacOS.swift
@@ -81,6 +81,11 @@ func getAudioDeviceIDFromUID(uid: String) -> AudioDeviceID? {
 
   // Get device UID
   for deviceID in deviceIDs {
+    // Support lookup by devicezID rather than uid
+    if String(deviceID) == uid {
+      return deviceID
+    }
+
     propertyAddress.mSelector = kAudioDevicePropertyDeviceUID
     propertySize = UInt32(MemoryLayout<CFString>.size)
     var deviceUID: Unmanaged<CFString>?