removed eq switching carousel, was annoying

Author: nodeful

ui/src/app/modules/eqmac-components/components/knob/knob.component.html

@@ -26,18 +26,6 @@
     <div class="slot"></div>
     <div class="body"></div>
     <div class="cap">
-      <!-- <svg width="58px" height="58px">
-        <defs>
-          <clipPath [id]="'large-knob-cap-clip-path-' + id" clipPathUnits="objectBoundingBox" width="58px" height="58px"
-            [ngStyle]="largeCapClipPathStyle">
-            <path
-              d="M0.95,0.28C0.93,0.36,0.95,0.43,1,0.5c0,0,0,0,0,0c0,0.08-0.02,0.15-0.05,0.22C0.88,0.75,0.83,0.81,0.81,0.89
-              C0.75,0.94,0.68,0.97,0.6,0.99c-0.07-0.03-0.13-0.03-0.2,0c-0.08-0.02-0.15-0.05-0.21-0.1C0.17,0.81,0.12,0.75,0.05,0.72
-              C0.02,0.65,0,0.58,0,0.5c0,0,0,0,0,0c0.05-0.06,0.07-0.14,0.05-0.22C0.09,0.21,0.14,0.14,0.2,0.1c0.07,0,0.13-0.03,0.17-0.08
-              C0.42,0.01,0.46,0,0.5,0c0.04,0,0.09,0.01,0.12,0.02C0.67,0.07,0.73,0.1,0.8,0.1C0.86,0.14,0.91,0.21,0.95,0.28z" />
-          </clipPath>
-        </defs>
-      </svg> -->
       <div class="cap-body" [ngStyle]="largeCapBodyStyle"></div>
       <div class="indicator" [ngStyle]="largeCapIndicatorStyle">
         <svg class="inner-line" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"

ui/src/app/sections/effects/equalizers/equalizers.component.html

@@ -45,21 +45,15 @@
   ></eqm-equalizer-presets>
 </div>
 <eqm-loading *ngIf="!loaded"></eqm-loading>
-<eqm-carousel class="equalizers" #equalizersCarousel [hidden]="!loaded" 
-[selectedItemId]="type" (selectedItemIdChange)="typeSwitched($event)" (itemCameIntoView)="equalizerCameIntoView($event)"
-(heightDiff)="carouselHeightChanged($event)"
-[animationDuration]="animationDuration"
->
-  <eqm-basic-equalizer #basicEqualizer *eqmCarouselItem="'Basic'"
-    [enabled]="enabled" class="equalizer" 
-    (presetsChange)="presets = $event" (selectedPresetChange)="selectedPreset = $event" 
-    [animationDuration]="animationDuration" [animationFps]="animationFps"
-    [settingsDialog]="settingsDialog"
-  ></eqm-basic-equalizer>
-  <eqm-advanced-equalizer #advancedEqualizer *eqmCarouselItem="'Advanced'"
-    [enabled]="enabled" class="equalizer"
-    (presetsChange)="presets = $event" (selectedPresetChange)="selectedPreset = $event"
-    [animationDuration]="animationDuration" [animationFps]="animationFps"
-    [settingsDialog]="settingsDialog"
-  ></eqm-advanced-equalizer>
-</eqm-carousel>
+<eqm-basic-equalizer fxFill *ngIf="loaded && type === 'Basic'" #basicEqualizer
+  [enabled]="enabled" class="equalizer" 
+  (presetsChange)="presets = $event" (selectedPresetChange)="selectedPreset = $event" 
+  [animationDuration]="animationDuration" [animationFps]="animationFps"
+  [settingsDialog]="settingsDialog"
+></eqm-basic-equalizer>
+<eqm-advanced-equalizer *ngIf="loaded && type === 'Advanced'" #advancedEqualizer
+  [enabled]="enabled" class="equalizer"
+  (presetsChange)="presets = $event" (selectedPresetChange)="selectedPreset = $event"
+  [animationDuration]="animationDuration" [animationFps]="animationFps"
+  [settingsDialog]="settingsDialog"
+></eqm-advanced-equalizer>

ui/src/app/sections/effects/equalizers/equalizers.component.ts

@@ -3,7 +3,6 @@ import { EqualizersService, EqualizerType } from './equalizers.service'
 import { BasicEqualizerComponent } from './basic-equalizer/basic-equalizer.component'
 import { AdvancedEqualizerComponent } from './advanced-equalizer/advanced-equalizer.component'
 import { EqualizerComponent } from './equalizer.component'
-import { CarouselComponent } from 'src/app/modules/eqmac-components/components/carousel/carousel.component'
 import { FadeInOutAnimation } from 'src/app/modules/animations'
 import { MatDialog, MatDialogRef } from '@angular/material/dialog'
 import { OptionsDialogComponent } from '../../../components/options-dialog/options-dialog.component'
@@ -21,7 +20,6 @@ export class EqualizersComponent implements OnInit {
   @Input() animationFps = 30
 
   @Output() visibilityToggled = new EventEmitter()
-  @ViewChild('equalizersCarousel', { static: false }) equalizersCarousel: CarouselComponent
   @ViewChild('basicEqualizer', { static: false }) basicEqualizer: BasicEqualizerComponent
   @ViewChild('advancedEqualizer', { static: false }) advancedEqualizer: AdvancedEqualizerComponent
 
@@ -43,11 +41,6 @@ export class EqualizersComponent implements OnInit {
 
   gain: number = 0
 
-  typeSwitched (newType: EqualizerType) {
-    this.type = newType
-    this.equalizersService.setType(newType)
-  }
-
   public settingsDialog: MatDialogRef<OptionsDialogComponent>
 
   constructor (
@@ -91,26 +84,10 @@ export class EqualizersComponent implements OnInit {
     this.equalizersService.setEnabled(this.enabled)
   }
 
-  previousType () {
-    this.equalizersCarousel.prev()
-  }
-
-  nextType () {
-    this.equalizersCarousel.next()
-  }
-
-  setType (type: EqualizerType) {
+  async setType (type: EqualizerType) {
     this.type = type
-    this.typeSwitched(type)
-  }
-
-  equalizerCameIntoView (type: EqualizerType) {
-    const equalizer = this.getEqualizerFromType(type)
-    equalizer && equalizer.selected()
-  }
-
-  carouselHeightChanged (heightDiff: number) {
-    this.ui.dimensionsChanged.next({ heightDiff })
+    await this.equalizersService.setType(type)
+    this.ui.dimensionsChanged.next()
   }
 
   public getEqualizerFromType (type: EqualizerType): EqualizerComponent {