Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Established audio input priority #387

Merged
merged 1 commit into from
Sep 17, 2019
Merged

Established audio input priority #387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/PluginEnumerateDevices.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class PluginEnumerateDevices {
NSLog("PluginEnumerateDevices#call()")
initAudioDevices()
var audioDevices: [MediaDeviceInfo] = getAllAudioDevices()
let devices: [AVCaptureDevice] = AVCaptureDevice.DiscoverySession.init( deviceTypes: [ AVCaptureDevice.DeviceType.builtInMicrophone, AVCaptureDevice.DeviceType.builtInWideAngleCamera], mediaType: nil, position: AVCaptureDevice.Position.unspecified).devices
let devices: [AVCaptureDevice] = AVCaptureDevice.DiscoverySession.init( deviceTypes: [ AVCaptureDevice.DeviceType.builtInMicrophone, AVCaptureDevice.DeviceType.builtInWideAngleCamera], mediaType: nil, position: AVCaptureDevice.Position.unspecified).devices
let json: NSMutableDictionary = [
"devices": NSMutableDictionary()
]
Expand Down Expand Up @@ -88,14 +88,38 @@ fileprivate func getAllAudioDevices() -> [MediaDeviceInfo] {
let audioSession: AVAudioSession = AVAudioSession.sharedInstance()
var audioDevicesArr : [MediaDeviceInfo] = []
let audioInputDevices: [AVAudioSessionPortDescription] = audioSession.availableInputs!
var bluetoothDevice: AVAudioSessionPortDescription? = nil
var isBluetoothConnected : Bool = false
var wiredDevice: AVAudioSessionPortDescription? = nil
var isWiredConnected : Bool = false
var builtMicDevice: AVAudioSessionPortDescription? = nil

for audioInput in audioInputDevices {
audioDevicesArr.append(MediaDeviceInfo(deviceId: audioInput.uid, kind: "audioinput", label: audioInput.portName))

// Initialize audioInputSelected. Default Built-In Microphone
if audioInput.portType == AVAudioSession.Port.builtInMic {
PluginEnumerateDevices.saveAudioDevice(inputDeviceUID: audioInput.uid)
builtMicDevice = audioInput
}

if audioInput.portType == .bluetoothHFP || audioInput.portType == .bluetoothA2DP {
bluetoothDevice = audioInput
isBluetoothConnected = true
}

if audioInput.portType == .usbAudio || audioInput.portType == .headsetMic {
wiredDevice = audioInput
isWiredConnected = true
}
}

// Initialize audioInputSelected. Priority: [Wired - Wireless - Built-In Microphone]
if isWiredConnected {
PluginEnumerateDevices.saveAudioDevice(inputDeviceUID: wiredDevice!.uid)
}else if isBluetoothConnected{
PluginEnumerateDevices.saveAudioDevice(inputDeviceUID: bluetoothDevice!.uid)
} else {
PluginEnumerateDevices.saveAudioDevice(inputDeviceUID: builtMicDevice!.uid)
}
return audioDevicesArr
}
Expand Down