bitgapp/eqMac
1
1
Fork 0
mirror of https://github.com/bitgapp/eqMac.git synced 2025-01-06 01:37:24 +03:00
Code Issues Projects Releases Wiki Activity

fixes #227 - crashes and no sound after device adding and removing

Browse Source
This commit is contained in:
Andrey Bezpalenko 2020-06-14 11:11:54 +03:00 committed by Roman Kisil
parent 56f2c8cac3
commit 3724746f66
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
native/app/Source/Application.swift
View File

@ -214,14 +214,28 @@ class Application {
Console.log("listChanged", list)
if list.added.count > 0 {
let added = list.added[0]
selectOutput(device: added)
for added in list.added {
if Output.isDeviceAllowed(added) {
selectOutput(device: added)
break
}
}
} else if (list.removed.count > 0) {
let removed = list.removed[0]
if (removed.id != selectedDevice.id) {
stopEngines()
var currentDeviceRemoved = false
for removed in list.removed {
if removed.id == selectedDevice.id {
currentDeviceRemoved = true
break
}
}
stopEngines()
if (!currentDeviceRemoved) {
try! AudioDeviceEvents.recreateEventEmitters([.isAliveChanged, .volumeChanged, .nominalSampleRateChanged])
self.setupDriverDeviceEvents()
Utilities.delay(500) {
createAudioPipeline()
createAudioPipeline()
}
}
}

6
native/app/Source/Audio/Outputs/Output.swift
View File

@ -13,6 +13,10 @@ import EmitterKit
import AVFoundation
class Output {
static func isDeviceAllowed(_ device: AudioDevice) -> Bool {
return device.transportType != nil && Constants.SUPPORTED_TRANSPORT_TYPES.contains(device.transportType!) && !device.isInputOnlyDevice()
}
static var allowedDevices: [AudioDevice] {
return AudioDevice.allOutputDevices()
.filter({ device in
@ -21,7 +25,7 @@ class Output {
return false
}
}
return device.transportType != nil && Constants.SUPPORTED_TRANSPORT_TYPES.contains(device.transportType!)
return isDeviceAllowed(device)
})
}

7
native/app/Source/Extensions/AudioDevice.swift
View File

@ -61,8 +61,11 @@ extension AudioDevice {
self.setMute(newValue, channel: 0, direction: .playback)
} else {
Console.log(self.channels(direction: .playback).intValue)
for channel in 1...self.channels(direction: .playback).intValue {
self.setMute(newValue, channel: UInt32(channel), direction: .playback)
let channels = self.channels(direction: .playback).intValue
if channels >= 1 {
for channel in 1...self.channels(direction: .playback).intValue {
self.setMute(newValue, channel: UInt32(channel), direction: .playback)
}
}
}
}