Improved volume handling

Author: nodeful

native/app/Embedded/ui.zip

@@ -251,6 +251,7 @@ class Application {
     setupDriverDeviceEvents()
   }
 
+  private static var ignoreNextDriverMuteEvent = false
   private static func setupDriverDeviceEvents () {
     AudioDeviceEvents.on(.volumeChanged, onDevice: Driver.device!) {
       if ignoreNextVolumeEvent {
@@ -264,11 +265,17 @@ class Application {
         return
       }
       let gain = Double(Driver.device!.virtualMasterVolume(direction: .playback)!)
+      Console.log(gain)
       if (gain <= 1 && gain != Application.store.state.effects.volume.gain) {
         Application.dispatchAction(VolumeAction.setGain(gain, false))
       }
     }
+  
     AudioDeviceEvents.on(.muteChanged, onDevice: Driver.device!) {
+      if (ignoreNextDriverMuteEvent) {
+        ignoreNextDriverMuteEvent = false
+        return
+      }
       Application.dispatchAction(VolumeAction.setMuted(Driver.device!.mute))
     }
   }
@@ -395,6 +402,12 @@ class Application {
 
   static var overrideNextVolumeEvent = false
   static func volumeChangeButtonPressed (direction: VolumeChangeDirection, quarterStep: Bool = false) {
+    if direction == .UP {
+      ignoreNextDriverMuteEvent = true
+      Utilities.delay(100) {
+        ignoreNextDriverMuteEvent = false
+      }
+    }
     let gain = volume.gain
     if (gain >= 1) {
       if direction == .DOWN {
@@ -426,6 +439,10 @@ class Application {
     }
   }
 
+  static func muteButtonPressed () {
+    ignoreNextDriverMuteEvent = false
+  }
+  
   private static func killEngine () {
     engine = nil
   }

native/app/Source/Application.swift

@@ -17,7 +17,7 @@ class Volume: StoreSubscriber {
   var gainChanged = EmitterKit.Event<Double>()
   var balanceChanged = EmitterKit.Event<Double>()
   var mutedChanged = EmitterKit.Event<Bool>()
-
+  
   // MARK: - Properties
   var gain: Double = 1 {
     didSet {
@@ -72,14 +72,23 @@ class Volume: StoreSubscriber {
             newRightGain = gain * Utilities.mapValue(value: Double(balance), inMin: 0, inMax: -1, outMin: 1, outMax: 0)
           }
         }
-                
+        
         Driver.device!.setVirtualMasterVolume(Float32(gain), direction: .playback)
       }
 
       leftGain = newLeftGain
       rightGain = newRightGain
-      Driver.device!.mute = false
-      device.mute = false
+      
+      if (!volumeSupported) {
+        Driver.device!.mute = false
+        device.mute = false
+      }
+      
+      let shouldMute = gain == 0.0
+      Driver.device!.mute = shouldMute
+      device.mute = shouldMute
+      
+      
       gainChanged.emit(gain)
 
     }

native/app/Source/Audio/Volume/Volume.swift

@@ -28,7 +28,7 @@ class EventInterceptor: NSApplication {
           Application.volumeChangeButtonPressed(direction: .DOWN, quarterStep: shiftPressed(event: event) && optionPressed(event: event))
           return
         case NX_KEYTYPE_MUTE:
-//          Application.toggleMute()
+          Application.muteButtonPressed()
           return
         default: break
         }

native/app/Source/EventInterceptor.swift

@@ -60,7 +60,6 @@ extension AudioDevice {
       if (self.canMuteVirtualMasterChannel(direction: .playback)) {
         self.setMute(newValue, channel: 0, direction: .playback)
       } else {
-        Console.log(self.channels(direction: .playback).intValue)
         let channels = self.channels(direction: .playback).intValue
         if channels >= 1 {
           for channel in 1...self.channels(direction: .playback).intValue {

native/app/Source/Extensions/AudioDevice.swift

@@ -11,7 +11,7 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
   selector: 'eqm-icon',
   templateUrl: './icon.component.html',
   styleUrls: ['./icon.component.scss'],
-  encapsulation: ViewEncapsulation.None
+  encapsulation: ViewEncapsulation.ShadowDom
 })
 export class IconComponent implements OnInit {
   @Input() width = 20