fix issue with volume being stuck on bluetooth & monterey

bitgapp · Nov 19, 2021 · 9d0cfd2 · 9d0cfd2
1 parent 729a03d
commit 9d0cfd2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/native/app/Source/Application.swift b/native/app/Source/Application.swift
@@ -43,6 +43,7 @@ class Application {
   static let audioPipelineIsRunning = EmitterKit.Event<Void>()
   static var audioPipelineIsRunningListener: EmitterKit.EventListener<Void>?
   private static var ignoreEvents = false
+  private static var ignoreVolumeEvents = false
 
   static var settings: Settings!
 
@@ -223,7 +224,10 @@ class Application {
   static var ignoreNextDriverMuteEvent = false
   static func setupDriverDeviceEvents () {
     AudioDeviceEvents.on(.volumeChanged, onDevice: Driver.device!) {
-      if ignoreEvents { return }
+      if ignoreEvents || ignoreVolumeEvents {
+        return
+      }
+
       if ignoreNextVolumeEvent {
         ignoreNextVolumeEvent = false
         return
@@ -381,15 +385,22 @@ class Application {
       onDevice: selectedDevice!,
       retain: false
     ) {
-      if ignoreEvents { return }
+      if ignoreEvents || ignoreVolumeEvents {
+        return
+      }
       if ignoreNextVolumeEvent {
         ignoreNextVolumeEvent = false
         return
       }
       let deviceVolume = selectedDevice!.virtualMasterVolume(direction: .playback)!
       let driverVolume = Driver.device!.virtualMasterVolume(direction: .playback)!
       if (deviceVolume != driverVolume) {
+        ignoreVolumeEvents = true
         Driver.device!.setVirtualMasterVolume(deviceVolume, direction: .playback)
+        Volume.gainChanged.emit(Double(deviceVolume))
+        delay (50) {
+          ignoreVolumeEvents = false
+        }
       }
     }
     audioPipelineIsRunning.emit()

diff --git a/native/app/Source/Audio/Volume/Volume.swift b/native/app/Source/Audio/Volume/Volume.swift
@@ -123,7 +123,7 @@ class Volume: StoreSubscriber {
   // MARK: - State
   typealias StoreSubscriberStateType = VolumeState
 
-  private let changeGainThread = DispatchQueue(label: "change-volume", qos: .background)
+  private let changeGainThread = DispatchQueue(label: "change-volume", qos: .userInteractive)
   private var latestChangeGainTask: DispatchWorkItem?
   private func performOnChangeGainThread (_ code: @escaping () -> Void) {
     latestChangeGainTask?.cancel()