refactoring, refactoring, refactoring

Author: nodeful

.gitignore

@@ -8,4 +8,5 @@ dist
 !modules/**/dist
 **/package-lock.json
 
-native/app/Embedded/*
+native/app/Embedded/*
+native/app/Sandbox.playground/Resources/track.mp3

native/app/Sandbox.playground/Contents.swift

@@ -1,70 +1,41 @@
 import AVFoundation
 import PlaygroundSupport
-import AMCoreAudio
 import Foundation
-import STPrivilegedTask
 
-Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { timer in
-    let randomNumber = Int.random(in: 1...20)
-    print("Number: \(randomNumber)")
-}
 
-PlaygroundPage.current.needsIndefiniteExecution = true
+var engine = AVAudioEngine()
+// File
+let path = Bundle.main.path(forResource: "track", ofType: "mp3")!
+let url = URL(fileURLWithPath: path)
+let file = try! AVAudioFile(forReading: url)
+let fileFormat = file.processingFormat
+let frameCount = UInt32(file.length)
 
-//
-//var engine = AVAudioEngine()
-//// File
-//let path = Bundle.main.path(forResource: "track", ofType: "mp3")!
-//let url = URL(fileURLWithPath: path)
-//let file = try! AVAudioFile(forReading: url)
-//let fileFormat = file.processingFormat
-//let frameCount = UInt32(file.length)
-//
-//let buffer = AVAudioPCMBuffer(pcmFormat: fileFormat, frameCapacity: frameCount)!
-//try! file.read(into: buffer, frameCount: frameCount)
-//
-//let player = AVAudioPlayerNode()
-//
-//let eq = AVAudioUnitEQ(numberOfBands: 3)
-//eq.bypass = false
-//eq.globalGain = -16
-//let gain = Float32(24)
-//let band1 = eq.bands[0]
-//band1.filterType = .parametric
-//band1.bandwidth = 0.5
-//band1.gain = gain
-//band1.frequency = 32.0
-//band1.bypass = false
-//
-//let band2 = eq.bands[1]
-//band2.filterType = .parametric
-//band2.bandwidth = 0.5
-//band2.gain = gain
-//band2.frequency = 64.0
-//band2.bypass = false
-//
-//let band3 = eq.bands[2]
-//band3.filterType = .parametric
-//band3.bandwidth = 0.5
-//band3.gain = gain
-//band3.frequency = 125.0
-//band3.bypass = false
-//
-//var varispeed = AVAudioUnitVarispeed()
-//
-//engine.attach(varispeed)
-//engine.attach(player)
-//engine.attach(eq)
-//
-//
-//engine.connect(player, to: varispeed, format: fileFormat)
-//engine.connect(varispeed, to: eq, format: fileFormat)
-//engine.connect(eq, to: engine.mainMixerNode, format: fileFormat)
-//
-//try! engine.outputNode.auAudioUnit.setDeviceID(AudioDevice.defaultOutputDevice()!.id)
-//engine.prepare()
-//try! engine.start()
-//print(engine)
-//
-//player.play()
-//player.scheduleBuffer(buffer, at: AVAudioTime(hostTime: 0), options:.loops, completionHandler: nil)
+let buffer = AVAudioPCMBuffer(pcmFormat: fileFormat, frameCapacity: frameCount)!
+try! file.read(into: buffer, frameCount: frameCount)
+
+let player = AVAudioPlayerNode()
+let mixer = AVAudioMixerNode()
+let eq = AVAudioUnitEQ()
+
+engine.attach(player)
+engine.attach(mixer)
+engine.attach(eq)
+engine.connect(player, to: mixer, format: fileFormat)
+engine.connect(mixer, to: eq, format: fileFormat)
+
+engine.connect(eq, to: engine.mainMixerNode, format: fileFormat)
+
+engine.prepare()
+
+try! engine.start()
+print(engine)
+engine.mainMixerNode.outputVolume = 0.01
+
+
+player.play()
+player.scheduleBuffer(buffer, at: AVAudioTime(hostTime: 0), options:.loops, completionHandler: nil)
+
+DispatchQueue.main.asyncAfter(deadline: .now() + 5, execute:  {
+  mixer.pan = -1
+})

native/app/Sandbox.playground/timeline.xctimeline

@@ -3,7 +3,7 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "file:///Users/nodeful/Programming/Bitgapp/eqMac/native/app/Sandbox.playground#CharacterRangeLen=38&amp;CharacterRangeLoc=1314&amp;EndingColumnNumber=2&amp;EndingLineNumber=52&amp;StartingColumnNumber=16&amp;StartingLineNumber=49&amp;Timestamp=615915215.608621"
+         documentLocation = "file:///Users/nodeful/Programming/Bitgapp/eqMac/native/app/Sandbox.playground#CharacterRangeLen=57&amp;CharacterRangeLoc=494&amp;EndingColumnNumber=0&amp;EndingLineNumber=19&amp;StartingColumnNumber=32&amp;StartingLineNumber=16&amp;Timestamp=645295599.40888"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>

native/app/Source/AppDelegate.swift

@@ -21,8 +21,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, SUUpdaterDelegate {
 
   func applicationDidFinishLaunching(_ aNotification: Notification) {
     for window in NSApplication.shared.windows {
+      window.resignFirstResponder()
       window.close()
     }
+
     updater.delegate = self
     updateProcessed.once { _ in
       Application.start()

native/app/Source/Application.swift

@@ -464,19 +464,9 @@ class Application {
     updater.checkForUpdates(nil)
   }
 
-  static func uninstall (_ completion: @escaping (Bool) -> Void) {
-    Driver.uninstall(started: {
-      self.stopSave()
-      UI.close()
-      Utilities.delay(100) { UI.showLoadingWindow("Uninstalling eqMac\nIf this process takes too long,\nplease restart your Mac") }
-    }) { success in
-      completion(success)
-      if (success) {
-        UI.hideLoadingWindow()
-        try! FileManager.default.removeItem(atPath: Bundle.main.bundlePath)
-        NSApp.terminate(nil)
-      }
-    }
+  static func uninstall () {
+    // TODO: Implement uninstaller
+    Console.log("// TODO: Download Uninstaller")
   }
 
   static func stopListeners () {

native/app/Source/ApplicationDataBus.swift

@@ -25,7 +25,7 @@ class ApplicationDataBus: DataBus {
         "model": Sysctl.model as String,
         "version": Bundle.main.infoDictionary?["CFBundleVersion"] as Any,
         "isOpenSource": Constants.OPEN_SOURCE,
-        "driverVersion": Driver.installedVersion
+        "driverVersion": Driver.installedVersion.description
       ]
     }
 
@@ -57,10 +57,7 @@ class ApplicationDataBus: DataBus {
     }
 
     self.on(.GET, "/uninstall") { _, res in
-      Application.uninstall() { success in
-        res.send([ "uninstalled": success ])
-      }
-      return nil
+      return "Downloading Uninstaller"
     }
 
     self.on(.GET, "/driver/reinstall/available") { _, res in

native/app/Source/Audio/Engine.swift

@@ -90,40 +90,32 @@ class Engine {
   }
 
   private func attachVolume () {
-//    engine.attach(volume.booster.avAudioNode)
-    engine.attach(volume.leftInput)
-    engine.attach(volume.rightInput)
-    engine.attach(volume.mixer)
-    engine.attach(volume.output)
-    engine.connect(volume.leftInput, to: volume.mixer, format: format)
-    engine.connect(volume.rightInput, to: volume.mixer, format: format)
-    engine.connect(volume.mixer, to: volume.output, format: format)
+    volume.attachToEngine(engine: engine)
   }
 
   private func chain () {
-    chainSourceToVolume()
-    chainVolumeToEffects()
+    chainSourceToEffects()
+    chainEffectsToVolume()
     chainEffects()
-    chainEffectsToSink()
+    chainVolumeToSink()
     setupRenderCallback()
   }
 
-  private func chainSourceToVolume () {
+  private func chainSourceToEffects () {
     Console.log("Chaining Source to Volume")
-    engine.connect(engine.inputNode, to: volume.leftInput, format: format)
-    engine.connect(engine.inputNode, to: volume.rightInput, format: format)
+    engine.connect(engine.inputNode, to: effects.equalizers.active.eq, format: format)
   }
 
-  private func chainVolumeToEffects () {
-    engine.connect(volume.output, 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 chainEffectsToSink () {
-    engine.connect(effects.equalizers.active.eq, to: engine.mainMixerNode, format: format)
+  private func chainVolumeToSink () {
+    engine.connect(volume.output, to: engine.mainMixerNode, format: format)
   }
 
   private func setupRenderCallback () {
@@ -174,6 +166,7 @@ class Engine {
 
   private func start () {
     engine.prepare()
+    volume.postSetup()
 
     Console.log("Starting Input Engine")
     Console.log(engine)

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

@@ -143,7 +143,6 @@ class Output {
 
   private func start () {
     outputEngine.prepare()
-    
     Console.log("Starting Output Engine")
     Console.log(outputEngine)
     try! outputEngine.start()

native/app/Source/Audio/Sources/System/Driver.swift

@@ -29,10 +29,6 @@ class Driver {
     }
   }
 
-  static var info: Dictionary<String, Any> {
-    return NSDictionary(contentsOfFile: Bundle.main.path(forResource: "Info", ofType: "plist", inDirectory: "Embedded/eqMac.driver/Contents")!) as! Dictionary<String, Any>
-  }
-
   static var sampleRates: [Double] {
     return [
       8_000,
@@ -185,17 +181,5 @@ class Driver {
     return AudioDevice.lookup(by: Constants.DRIVER_DEVICE_UID)
   }
 
-  static func install (started: (() -> Void)? = nil, _ finished: @escaping (Bool) -> Void) {
-    Script.sudo("install_driver", started: started, { success in
-      finished(success)
-    })
-  }
-  
-  static func uninstall (started: (() -> Void)? = nil, _ finished: @escaping (Bool) -> Void) {
-    Script.sudo("uninstall_driver", started: started, { success in
-      finished(success)
-    })
-  }
-  
 }