moved Volume to the output engine, fixed annoying buzzer when switching eqs

Author: nodeful

native/app/Source/Application.swift

@@ -194,7 +194,7 @@ class Application {
         let currentDeviceRemoved = list.removed.contains(where: { $0.id == selectedDevice.id })
 
         if (currentDeviceRemoved) {
-          stopEngines()
+          removeEngines()
           try! AudioDeviceEvents.recreateEventEmitters([.isAliveChanged, .volumeChanged, .nominalSampleRateChanged])
           self.setupDriverDeviceEvents()
           Utilities.delay(500) {
@@ -245,7 +245,7 @@ class Application {
   }
 
   static func selectOutput (device: AudioDevice) {
-    stopEngines()
+    stopRemoveEngines()
     Utilities.delay(500) {
       AudioDevice.currentOutputDevice = device
     }
@@ -293,13 +293,12 @@ class Application {
     _ = Sources() { sources in
       self.sources = sources
       effects = Effects()
-      volume = Volume()
       engine = Engine(
         sources: sources,
-        effects: effects,
-        volume: volume
+        effects: effects
       )
-      output = Output(device: selectedDevice, engine: engine)
+      volume = Volume()
+      output = Output(device: selectedDevice, engine: engine, volume: volume)
 
       selectedDeviceIsAliveListener = AudioDeviceEvents.on(
         .isAliveChanged,
@@ -318,7 +317,7 @@ class Application {
         onDevice: selectedDevice,
         retain: false
       ) {
-        stopEngines()
+        stopRemoveEngines()
         Utilities.delay(100) {
           // need a delay, because emitter should finish it's work at first
           try! AudioDeviceEvents.recreateEventEmitters([.isAliveChanged, .volumeChanged, .nominalSampleRateChanged])
@@ -351,12 +350,18 @@ class Application {
   }
 
   static func stopEngines () {
-    if (output != nil) {
-      output = nil
-    }
-    if (engine != nil) {
-      engine = nil
-    }
+    output?.stop()
+    engine?.stop()
+  }
+
+  static func removeEngines () {
+    output = nil
+    engine = nil
+  }
+
+  static func stopRemoveEngines () {
+    stopEngines()
+    removeEngines()
   }
 
   private static func setupDataBus () {
@@ -436,7 +441,7 @@ class Application {
 
   static func stopSave () {
     stopListeners()
-    stopEngines()
+    stopRemoveEngines()
     switchBackToLastKnownDevice()
     Storage.synchronize()
   }

native/app/Source/Audio/Engine.swift

@@ -17,7 +17,6 @@ class Engine {
   private var eventListeners: [Any] = []
   let sources: Sources
   let effects: Effects
-  let volume: Volume
   var attachedEqualizer: Equalizer?
 
   var format: AVAudioFormat!
@@ -28,11 +27,10 @@ class Engine {
   // Middleware
   var buffer: CircularBuffer<Float>!
 
-  init (sources: Sources, effects: Effects, volume: Volume) {
+  init (sources: Sources, effects: Effects) {
     Console.log("Creating Engine")
     self.sources = sources
     self.effects = effects
-    self.volume = volume
     setupEngine()
     setupSink()
     setupBuffer()
@@ -58,7 +56,6 @@ class Engine {
   private func attach () {
     attachSource()
     attachEffects()
-    attachVolume()
   }
 
   private func attachSource () {
@@ -89,38 +86,29 @@ class Engine {
     attachEqualizer()
   }
 
-  private func attachVolume () {
-    volume.attachToEngine(engine: engine)
-  }
-  
   private func chain () {
     chainSourceToEffects()
-    chainEffectsToVolume()
     chainEffects()
-    chainVolumeToSink()
+    chainEffectsToSink()
     setupRenderCallback()
   }
 
   private func chainSourceToEffects () {
     Console.log("Chaining Source to Volume")
     engine.connect(engine.inputNode, to: effects.equalizers.active.eq, format: format)
   }
-  
-  private func chainEffectsToVolume () {
-    engine.connect(effects.equalizers.active.eq, to: volume.mixer, format: format)
-  }
-  
+
   private func chainEffects () {
     Console.log("Chaining Effects")
   }
 
-  private func chainVolumeToSink () {
-    engine.connect(volume.booster, to: engine.mainMixerNode, format: format)
+  private func chainEffectsToSink () {
+    engine.connect(effects.equalizers.active.eq, to: engine.mainMixerNode, format: format)
   }
 
   private func setupRenderCallback () {
     Console.log("Setting up Input Render Callback")
-    let lastAVUnit = volume.booster as AVAudioUnit
+    let lastAVUnit = effects.equalizers.active.eq as AVAudioUnit
     if let err = checkErr(AudioUnitAddRenderNotify(lastAVUnit.audioUnit,
                                                    renderCallback,
                                                    UnsafeMutableRawPointer(Unmanaged<Engine>.passUnretained(self).toOpaque()))) {
@@ -166,7 +154,6 @@ class Engine {
 
   private func start () {
     engine.prepare()
-    volume.postSetup()
 
     Console.log("Starting Input Engine")
     Console.log(engine)

native/app/Source/Audio/Outputs/Output.swift

@@ -35,6 +35,7 @@ class Output {
 
   var device: AudioDevice
   var engine: Engine
+  var volume: Volume
   var outputEngine = AVAudioEngine()
   var player = AVAudioPlayerNode()
   var varispeed = AVAudioUnitVarispeed()
@@ -50,11 +51,12 @@ class Output {
   var lowestVarispeedRate: Float
   var highestVarispeedRate: Float
 
-  init(device: AudioDevice!, engine: Engine!) {
+  init(device: AudioDevice, engine: Engine, volume: Volume) {
     Console.log("Creating Output for Device: " + device.name)
     self.device = device
     self.engine = engine
-    
+    self.volume = volume
+
     outputEngine.setOutputDevice(device)
 
     let format = AVAudioFormat.init(
@@ -72,8 +74,11 @@ class Output {
 
     outputEngine.attach(player)
     outputEngine.attach(varispeed)
+    volume.attachToEngine(engine: outputEngine)
+
     outputEngine.connect(player, to: varispeed, format: format)
-    outputEngine.connect(varispeed, to: outputEngine.mainMixerNode, format: format)
+    outputEngine.connect(varispeed, to: volume.booster, format: format)
+    outputEngine.connect(volume.mixer, to: outputEngine.mainMixerNode, format: format)
 
     self.setupCallback()
 
@@ -109,7 +114,7 @@ class Output {
     let output = Unmanaged<Output>.fromOpaque(outputPointer).takeUnretainedValue()
 
     // No input yet, wait
-    if (output.engine.lastSampleTime == -1) {
+    if (!output.engine.engine.isRunning || output.engine.lastSampleTime == -1) {
       makeBufferSilent(abl)
       return noErr
     }

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

@@ -29,13 +29,12 @@ class Volume: StoreSubscriber {
       let device: AudioDevice! = Application.selectedDevice
       let volumeSupported = device.outputVolumeSupported
       let balanceSupported = device.outputBalanceSupported
-      
+      var virtualVolume: Double = 1
       if (gain <= 1) {
         if (volumeSupported) {
           device.setVirtualMasterVolume(Float32(gain), direction: .playback)
-          booster.globalGain = 0
         } else {
-          booster.globalGain = Float(Utilities.mapValue(value: gain, inMin: 0, inMax: 1, outMin: -96, outMax: 0))
+          virtualVolume = gain
         }
 
         if (balanceSupported) {
@@ -45,13 +44,13 @@ class Volume: StoreSubscriber {
           mixer.pan = Float(balance)
         }
 
+        booster.globalGain = 0
         Driver.device!.setVirtualMasterVolume(Float32(gain), direction: .playback)
-
       } else { // gain > 1
         if (volumeSupported) {
           device.setVirtualMasterVolume(1.0, direction: .playback)
         }
-        booster.globalGain = Float(Utilities.mapValue(value: gain, inMin: 1, inMax: 2, outMin: 0, outMax: 12))
+        virtualVolume = Utilities.mapValue(value: gain, inMin: 1, inMax: 2, outMin: 0, outMax: 6)
 
         if (balanceSupported) {
           device.setVirtualMasterBalance(Float32(Utilities.mapValue(value: balance, inMin: -1, inMax: 1, outMin: 0, outMax: 1)), direction: .playback)
@@ -63,7 +62,8 @@ class Volume: StoreSubscriber {
         Driver.device!.setVirtualMasterVolume(1, direction: .playback)
       }
 
-      
+      mixer.outputVolume = Float(virtualVolume)
+
       if (!volumeSupported) {
         Driver.device!.mute = false
         device.mute = false
@@ -77,16 +77,13 @@ class Volume: StoreSubscriber {
 
       Application.ignoreNextVolumeEvent = false
       Application.ignoreNextDriverMuteEvent = false
-
-      Console.log("Boost: \(booster.globalGain)  Mix: \(mixer.pan)")
     }
   }
 
   var muted: Bool = false {
     didSet {
       if (muted) {
-//        leftGain = 0
-//        rightGain = 0
+        mixer.outputVolume = 0
       } else {
         (gain = gain)
       }
@@ -169,12 +166,12 @@ class Volume: StoreSubscriber {
 
   func attachToEngine (engine: AVAudioEngine) {
     self.engine = engine
-    let format = engine.inputNode.inputFormat(forBus: 0)
+    let format = engine.outputNode.outputFormat(forBus: 0)
 
     engine.attach(booster)
     engine.attach(mixer)
 
-    engine.connect(mixer, to: booster, format: format)
+    engine.connect(booster, to: mixer, format: format)
   }
 
   func postSetup () {