added reset playback button, stability improvements, fixed preset import

nodeful · nodeful · commit 63299b87837a · 2020-04-27T01:38:15.000+01:00
diff --git a/native/app/Source/Application.swift b/native/app/Source/Application.swift
@@ -265,6 +265,14 @@ class Application {
     Driver.device!.setVirtualMasterVolume(volume > 1 ? 1 : Float32(volume), direction: .playback)
     Driver.latency = selectedDevice.latency(direction: .playback) ?? 0 // Set driver latency to mimic device
     Driver.safetyOffset = selectedDevice.safetyOffset(direction: .playback) ?? 0 // Set driver latency to mimic device
+    let outputSampleRate = selectedDevice.actualSampleRate()!
+    let driverSampleRates = Driver.sampleRates
+    let closestSampleRate = driverSampleRates.min( by: { abs($0 - outputSampleRate) < abs($1 - outputSampleRate) } )!
+    Driver.device!.setNominalSampleRate(closestSampleRate)
+    
+    Console.log("Driver new Latency: \(Driver.latency)")
+    Console.log("Driver new Safety Offset: \(Driver.safetyOffset)")
+    Console.log("Driver new Sample Rate: \(Driver.device!.actualSampleRate())")
 
     AudioDevice.currentOutputDevice = Driver.device!
     // TODO: Figure out a better way
@@ -274,12 +282,7 @@ class Application {
   }
   
   private static func createAudioPipeline () {
-    Sources() { sources in
-      let outputSampleRate = selectedDevice.actualSampleRate()!
-      let driverSampleRates = Driver.sampleRates
-      let closestSampleRate = driverSampleRates.min( by: { abs($0 - outputSampleRate) < abs($1 - outputSampleRate) } )!
-      Driver.device!.setNominalSampleRate(closestSampleRate)
-  
+    _ = Sources() { sources in
       self.sources = sources
       effects = Effects()
       volume = Volume()
diff --git a/native/app/Source/Audio/Effects/Equalizers/Advanced/AdvancedEqualizerDataBus.swift b/native/app/Source/Audio/Effects/Equalizers/Advanced/AdvancedEqualizerDataBus.swift
@@ -127,27 +127,30 @@ class AdvancedEqualizerDataBus: DataBus {
         }
         
         if let json = try? String(contentsOf: file!) {
-          let presets = JSON(parseJSON: json).arrayObject as! [[String: Any]]
-          for var preset in presets {
-            let bands = preset["gains"] as? [Double]
-            let name = preset["name"] as? String
-            
-            if (bands == nil || bands?.count != 10 || name == nil) {
-              res.error("Invalid import file. Must be an array of objects of type { gains: Double[10], name: String }")
-              return
+          let presets = JSON(parseJSON: json).arrayValue
+          for preset in presets {
+            if let gains = preset["gains"].dictionary, let name = preset["name"].string {
+              let global = gains["global"]?.double
+              if let bands = gains["bands"]?.arrayObject as? [Double] {
+                if preset["id"].string == "manual" {
+                  AdvancedEqualizer.updatePreset(id: "manual", gains: AdvancedEqualizerPresetGains(
+                    global: global ?? 0, bands: bands
+                  ))
+                } else {
+                  _ = AdvancedEqualizer.createPreset(name: name, gains: AdvancedEqualizerPresetGains(
+                    global: global ?? 0, bands: bands
+                  ))
+                }
+                
+              }
             }
-            
-            _ = AdvancedEqualizer.createPreset(name: name!, gains: AdvancedEqualizerPresetGains(
-              global: 0, bands: bands!
-            ))
           }
-          
           res.send("Presets imported.")
         } else {
           res.error("File is not readable format.")
         }
         
-
+        
       }
       return nil
     }
diff --git a/native/app/Source/Audio/Outputs/OutputsDataBus.swift b/native/app/Source/Audio/Outputs/OutputsDataBus.swift
@@ -27,11 +27,8 @@ class OutputsDataBus: DataBus {
     self.on(.POST, "/selected") { data, _ in
       if let id = data["id"] as? AudioDeviceID {
         if let device = AudioDevice.lookup(by: id) {
-          if (device.id != Outputs.current) {
             Application.selectOutput(device: device)
             return "Output Selected"
-          }
-          throw "This device is already playing"
         }
         throw "Device with such ID doesn't exist"
       }
diff --git a/native/driver/Driver.xcodeproj/project.pbxproj b/native/driver/Driver.xcodeproj/project.pbxproj
@@ -634,7 +634,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = JZA6C97KJA;
-				GCC_C_LANGUAGE_STANDARD = "compiler-default";
+				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -673,7 +673,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = JZA6C97KJA;
 				ENABLE_NS_ASSERTIONS = NO;
-				GCC_C_LANGUAGE_STANDARD = "compiler-default";
+				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
diff --git a/ui/src/app/modules/eqmac-components/assets/icons/reset.svg b/ui/src/app/modules/eqmac-components/assets/icons/reset.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
+<g><path d="M500,132.3V10L279.6,204.8L500,399.5V268c161.9,0,293.2,131.3,293.2,293.2c0,161.9-131.3,293.2-293.2,293.2c-161.9,0-293.2-131.3-293.2-293.2c0-38.9,7.6-76,21.4-110l-127.7-46.3c-19,48.4-29.4,101.2-29.4,156.3C71.1,798,263.1,990,500,990c236.9,0,428.9-192,428.9-428.9C928.9,324.3,736.9,132.3,500,132.3z"/><path d="M408.4,569c0,48.3,39.1,87.4,87.4,87.4c48.3,0,87.4-39.1,87.4-87.4c0-48.3-39.1-87.4-87.4-87.4C447.6,481.7,408.4,520.8,408.4,569z"/></g>
+</svg>
diff --git a/ui/src/app/modules/eqmac-components/components/dropdown/dropdown.component.ts b/ui/src/app/modules/eqmac-components/components/dropdown/dropdown.component.ts
@@ -45,7 +45,8 @@ export class DropdownComponent implements OnInit {
   async ngOnInit () {
     if (!this.items) this.items = []
     if (!this.selectedItem && this.items.length > 0) {
-      this.selectItem(this.items[0])
+      this.selectedItem = this.items[0]
+      this.label = null
     }
     this.setDimensions()
     this.calculateYCoordinate()
diff --git a/ui/src/app/modules/eqmac-components/components/knob/knob.component.ts b/ui/src/app/modules/eqmac-components/components/knob/knob.component.ts
@@ -152,9 +152,9 @@ export class KnobComponent implements OnInit {
         this.dragStartDegr = degrees
         const multiplier = (() => {
           switch (this.size) {
-            case 'large': return 110
+            case 'large': return 250
             case 'medium': return 220
-            case 'small': return 400
+            case 'small': return 600
             default: return 220
           }
         })()
diff --git a/ui/src/app/modules/eqmac-components/components/tooltip/tooltip.directive.ts b/ui/src/app/modules/eqmac-components/components/tooltip/tooltip.directive.ts
@@ -7,7 +7,7 @@ import { TooltipPositionSide } from './tooltip.component'
 })
 export class TooltipDirective implements OnDestroy {
   @Input() eqmTooltip = ''
-  @Input() eqmTooltipDelay = 1000
+  @Input() eqmTooltipDelay = 100
   @Input() eqmTooltipPositionSide: TooltipPositionSide = 'top'
   @Input() eqmTooltipShowArrow: boolean = true
   private id: string
diff --git a/ui/src/app/sections/effects/equalizers/advanced-equalizer/advanced-equalizer.component.ts b/ui/src/app/sections/effects/equalizers/advanced-equalizer/advanced-equalizer.component.ts
@@ -142,6 +142,7 @@ export class AdvancedEqualizerComponent extends EqualizerComponent implements On
   protected setupEvents () {
     this.service.onPresetsChanged(presets => {
       if (!presets) return
+      console.log('new presets', presets)
       this.presets = presets
     })
     this.service.onSelectedPresetChanged(preset => {
diff --git a/ui/src/app/sections/outputs/outputs.component.html b/ui/src/app/sections/outputs/outputs.component.html
@@ -1,7 +1,8 @@
 <div fxFill class="outputs" fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="10px">
-  <eqm-vent fxFlex="20"></eqm-vent>
+  <!-- <eqm-vent fxFlex="20"></eqm-vent> -->
+  <eqm-icon (click)="select(selected)" name="reset" color="#4f8d71" eqmTooltip="Reset playback" eqmTooltipPositionSide="top"></eqm-icon>
   <eqm-dropdown 
-  fxFlex="55" labelParam="name" noItemsPlaceholder="No Outputs" placeholder="Select Output" 
+  labelParam="name" noItemsPlaceholder="No Outputs" placeholder="Select Output" 
   [items]="outputs" [(selectedItem)]="selected" (itemSelected)="select($event)"
   ></eqm-dropdown>
   <eqm-vent fxFlex="20"></eqm-vent>

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,8 @@ class OutputsDataBus: DataBus {`
`27`	`27`	`self.on(.POST, "/selected") { data, _ in`
`28`	`28`	`if let id = data["id"] as? AudioDeviceID {`
`29`	`29`	`if let device = AudioDevice.lookup(by: id) {`
`30`		`- if (device.id != Outputs.current) {`
`31`	`30`	`Application.selectOutput(device: device)`
`32`	`31`	`return "Output Selected"`
`33`		`- }`
`34`		`- throw "This device is already playing"`
`35`	`32`	`}`
`36`	`33`	`throw "Device with such ID doesn't exist"`
`37`	`34`	`}`