Added clamp util, remove unused utils

Author: ajm13

src/components/AudioControls.vue

@@ -15,7 +15,11 @@
       <i v-show="!microphone.enabled" class="material-icons off">mic_off</i>
       <i v-show="microphone.enabled" class="material-icons">mic</i>
     </div>
-    <div class="button playlist" @click="showPlaylist = !showPlaylist" :class="{ off: !showPlaylist }">
+    <div
+      class="button playlist"
+      @click="showPlaylist = !showPlaylist"
+      :class="{ off: !showPlaylist }"
+    >
       <i class="material-icons">queue_music</i>
       <transition name="playlist">
         <div class="list" v-show="showPlaylist">
@@ -35,6 +39,8 @@
 </template>
 
 <script>
+import Utils from '@/js/Utils'
+
 export default {
   props: {
     audio: {
@@ -70,6 +76,7 @@ export default {
     playlistNext() {
       this.playlist.next()
     },
+
     timeUpdate() {
       let p = this.audio.currentTime / this.audio.duration
       let bar = document.querySelector('.progress > .scrubber')
@@ -79,42 +86,50 @@ export default {
       this.timePassed = t
       this.timeRemaining = Math.floor(this.audio.duration) - t
     },
+
     togglePlay() {
       if (this.audio.ended && this.playlist.hasNext()) this.playlist.next()
 
       if (this.audio.paused && this.audio.readyState == 4) this.audio.play()
       else this.audio.pause()
     },
+
     updatePaused() {
       this.paused = this.audio.paused
     },
+
     stopMicOnPlay() {
       if (this.microphone.enabled) this.microphone.toggle()
     },
+
     scrub(e) {
       let { progress } = this.$refs
       let p = e.offsetX / progress.offsetWidth
       let paused = this.audio.paused
       this.audio.currentTime = p * this.audio.duration
       if (paused) this.audio.pause()
     },
+
     mousedown(e) {
       if (!this.audio.src) return
       this.seeking = e.pageX - e.offsetX
       this.scrub(e)
     },
+
     mousemove(e) {
       if (this.seeking) {
         let { progress } = this.$refs
         let offset = e.pageX - this.seeking
-        offset = Math.max(0, Math.min(progress.offsetWidth, offset))
+        offset = Utils.clamp(offset, 0, progress.offsetWidth)
         if (offset == progress.offsetWidth) this.seeking = false
         this.scrub({ offsetX: offset })
       }
     },
+
     mouseup() {
       this.seeking = false
     },
+
     keyup(e) {
       e.preventDefault()
       switch (e.keyCode) {

src/components/VisSettings.vue

@@ -36,6 +36,7 @@
 
 <script>
 import { mapMutations, mapState } from 'vuex'
+import Utils from '@/js/Utils'
 
 export default {
   props: ['visualizer'],
@@ -62,7 +63,7 @@ export default {
     changeScale(dir) {
       const v = this.visualizer
       let scale = Math.floor(v.scale * 2 + dir) / 2
-      scale = Math.max(0.5, Math.min(2.5, scale))
+      scale = Utils.clamp(scale, 0.5, 2.5)
 
       if (scale !== v.scale) {
         v.scale = scale

src/js/Utils.js

@@ -18,6 +18,10 @@ export default {
     return avg
   },
 
+  clamp(x, min, max) {
+    return Math.max(min, Math.min(max, x))
+  },
+
   lerp(a, b, n) {
     return n * (b - a) + a
   },
@@ -53,44 +57,6 @@ export default {
     return maxes
   },
 
-  avgbin(data, n, lengths) {
-    n = Math.floor(n)
-    let tmpdata = new Array(n).fill(0)
-    let bl = Math.floor(data.length / n)
-
-    if (lengths) {
-      n = lengths.length
-      for (let i = 0; i < n; i++) {
-        bl = lengths
-        if (bl[i][1] !== undefined) {
-          for (let c = 0; c < bl[i][1]; c++) {
-            for (let j = 0; j < bl[i][0]; j++) {
-              tmpdata[i] += data[bl[i][0] * i + j]
-            }
-            tmpdata[i] = tmpdata[i] / bl[i][0]
-          }
-        } else {
-          for (let j = 0; j < bl[i]; j++) {
-            tmpdata[i] += data[bl[i] * i + j]
-          }
-          tmpdata[i] = tmpdata[i] / bl[i]
-        }
-      }
-    } else {
-      for (let i = 0; i < n; i++) {
-        for (let j = 0; j < bl; j++) {
-          tmpdata[i] += data[bl * i + j]
-        }
-        tmpdata[i] = tmpdata[i] / bl
-      }
-    }
-    return tmpdata
-  },
-
-  remap(value, low1, high1, low2, high2) {
-    return low2 + ((high2 - low2) * (value - low1)) / (high1 - low1)
-  },
-
   dist(x1, y1, x2, y2) {
     let dx = x2 - x1
     let dy = y2 - y1