bitgapp/eqMac
1
1
Fork 0
mirror of https://github.com/bitgapp/eqMac.git synced 2024-11-22 13:07:26 +03:00
Code Issues Projects Releases Wiki Activity

fixed Driver device event when sampling rates changes

Browse Source
This commit is contained in:
nodeful 2020-06-10 23:06:14 +01:00
parent 5bbeb6b7a2
commit 22d259b842
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,9 +110,9 @@ class Application {
private static func installDriver (_ completion: @escaping() -> Void) {
if !Driver.isInstalled || Driver.isOutdated {
Alert.confirm(
title: "Audio Driver Installation",
message: "eqMac needs to install an Audio Driver. \nIn order to do that we will ask for your System Password. \nPlease close any apps playing audio (Spotify, YouTube etc.) otherwise installation might fail.",
cancelText: "Quit eqMac"
title: "Audio Driver Installation",
message: "eqMac needs to install an Audio Driver. \nIn order to do that we will ask for your System Password. \nPlease close any apps playing audio (Spotify, YouTube etc.) otherwise installation might fail.",
cancelText: "Quit eqMac"
) { install in
if install {
Driver.install(started: {
@ -201,7 +201,7 @@ class Application {
}
static var ignoreNextVolumeEvent = false
private static func setupDeviceEvents () {
AudioDeviceEvents.on(.outputChanged) { device in
if device.isHardware {
@ -209,25 +209,6 @@ class Application {
startPassthrough()
}
}
AudioDeviceEvents.on(.volumeChanged, onDevice: Driver.device!) {
if ignoreNextVolumeEvent {
ignoreNextVolumeEvent = false
return
}
if (overrideNextVolumeEvent) {
overrideNextVolumeEvent = false
ignoreNextVolumeEvent = true
Driver.device!.setVirtualMasterVolume(1, direction: .playback)
return
}
let gain = Double(Driver.device!.virtualMasterVolume(direction: .playback)!)
if (gain <= 1 && gain != Application.store.state.effects.volume.gain) {
Application.dispatchAction(VolumeAction.setGain(gain, false))
}
}
AudioDeviceEvents.on(.muteChanged, onDevice: Driver.device!) {
Application.dispatchAction(VolumeAction.setMuted(Driver.device!.mute))
}
AudioDeviceEvents.onDeviceListChanged { list in
Console.log("listChanged", list)
@ -252,6 +233,30 @@ class Application {
selectOutput(device: device)
}
}
setupDriverDeviceEvents()
}
private static func setupDriverDeviceEvents () {
AudioDeviceEvents.on(.volumeChanged, onDevice: Driver.device!) {
if ignoreNextVolumeEvent {
ignoreNextVolumeEvent = false
return
}
if (overrideNextVolumeEvent) {
overrideNextVolumeEvent = false
ignoreNextVolumeEvent = true
Driver.device!.setVirtualMasterVolume(1, direction: .playback)
return
}
let gain = Double(Driver.device!.virtualMasterVolume(direction: .playback)!)
if (gain <= 1 && gain != Application.store.state.effects.volume.gain) {
Application.dispatchAction(VolumeAction.setGain(gain, false))
}
}
AudioDeviceEvents.on(.muteChanged, onDevice: Driver.device!) {
Application.dispatchAction(VolumeAction.setMuted(Driver.device!.mute))
}
}
static func selectOutput (device: AudioDevice) {
@ -331,10 +336,11 @@ class Application {
) {
// selectOutput(device: selectedDevice)
Utilities.delay(100) {
// need a delay, because emitter should finish it's work at first
try! AudioDeviceEvents.recreateEventEmitters([.isAliveChanged, .volumeChanged, .nominalSampleRateChanged])
stopEngines()
createAudioPipeline()
// need a delay, because emitter should finish it's work at first
try! AudioDeviceEvents.recreateEventEmitters([.isAliveChanged, .volumeChanged, .nominalSampleRateChanged])
self.setupDriverDeviceEvents()
stopEngines()
createAudioPipeline()
}
}
@ -405,7 +411,7 @@ class Application {
Application.dispatchAction(VolumeAction.setGain(newGain, false))
}
}
private static func killEngine () {
engine = nil
}