Merge pull request #28 from kaythomas0/v0.6.0

v0.6.0

README.md

@@ -65,3 +65,21 @@ npm run server-prod
 # Contributing
 
 See [CONTRIBUTING.md](https://github.com/kaythomas0/noisedash/blob/main/CONTRIBUTING.md)
+
+# License
+
+    Noisedash, a self-hostable web tool for generating ambient noises 
+    Copyright (C) 2021  Kay Thomas <kaythomas@pm.me>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "noisedash",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "noisedash",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "private": true,
   "author": "Kay Thomas <kaythomas@pm.me> (https://kaythomas.dev)",
   "scripts": {

server/boot/db.js

@@ -73,6 +73,18 @@ module.exports = function () {
 
           db.run('PRAGMA user_version = 2')
         }
+
+        if (userVersion < 3) {
+          db.run('ALTER TABLE profiles_samples ADD COLUMN reverb_enabled INTEGER DEFAULT 0')
+          db.run('ALTER TABLE profiles_samples ADD COLUMN reverb_pre_delay REAL DEFAULT 0')
+          db.run('ALTER TABLE profiles_samples ADD COLUMN reverb_decay REAL DEFAULT 0')
+          db.run('ALTER TABLE profiles_samples ADD COLUMN reverb_wet INTEGER DEFAULT 0')
+          db.run('ALTER TABLE profiles_samples ADD COLUMN playback_mode TEXT DEFAULT "continuous"')
+          db.run('ALTER TABLE profiles_samples ADD COLUMN sporadic_min INTEGER DEFAULT 30')
+          db.run('ALTER TABLE profiles_samples ADD COLUMN sporadic_max INTEGER DEFAULT 300')
+
+          db.run('PRAGMA user_version = 3')
+        }
       }
     })
   })

server/routes/profiles.js

@@ -59,10 +59,28 @@ router.post('/profiles', (req, res) => {
       profileID = this.lastID
 
       req.body.samples.forEach(s => {
-        db.run('INSERT INTO profiles_samples (profile, sample, volume) VALUES (?, ?, ?)', [
+        db.run(`INSERT INTO profiles_samples(
+          profile,
+          sample,
+          volume,
+          reverb_enabled,
+          reverb_pre_delay,
+          reverb_decay,
+          reverb_wet,
+          playback_mode,
+          sporadic_min,
+          sporadic_max)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
           profileID,
           s.id,
-          s.volume
+          s.volume,
+          s.reverbEnabled,
+          s.reverbPreDelay,
+          s.reverbDecay,
+          s.reverbWet,
+          s.playbackMode,
+          s.sporadicMin,
+          s.sporadicMax
         ],
         (err) => {
           if (err) {
@@ -204,10 +222,28 @@ router.put('/profiles/:profileId', (req, res) => {
         })
 
         req.body.samples.forEach(s => {
-          db.run('INSERT INTO profiles_samples (profile, sample, volume) VALUES (?, ?, ?)', [
+          db.run(`INSERT INTO profiles_samples(
+            profile,
+            sample,
+            volume,
+            reverb_enabled,
+            reverb_pre_delay,
+            reverb_decay,
+            reverb_wet,
+            playback_mode,
+            sporadic_min,
+            sporadic_max)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
             req.params.profileId,
             s.id,
-            s.volume
+            s.volume,
+            s.reverbEnabled,
+            s.reverbPreDelay,
+            s.reverbDecay,
+            s.reverbWet,
+            s.playbackMode,
+            s.sporadicMin,
+            s.sporadicMax
           ],
           (err) => {
             if (err) {
@@ -355,6 +391,13 @@ router.get('/profiles/:profileId', (req, res) => {
           samples.id,
           name,
           profiles_samples.volume,
+          profiles_samples.reverb_enabled as reverbEnabled,
+          profiles_samples.reverb_pre_delay as reverbPreDelay,
+          profiles_samples.reverb_decay as reverbDecay,
+          profiles_samples.reverb_wet as reverbWet,
+          profiles_samples.playback_mode as playbackMode,
+          profiles_samples.sporadic_min as sporadicMin,
+          profiles_samples.sporadic_max as sporadicMax,
           fade_in as fadeIn,
           loop_points_enabled as loopPointsEnabled,
           loop_start as loopStart,
@@ -382,6 +425,13 @@ router.get('/profiles/:profileId', (req, res) => {
             sample.loopPointsEnabled = row.loopPointsEnabled === 1
             sample.loopStart = row.loopStart
             sample.loopEnd = row.loopEnd
+            sample.reverbEnabled = row.reverbEnabled === 1
+            sample.reverbPreDelay = row.reverbPreDelay
+            sample.reverbDecay = row.reverbDecay
+            sample.reverbWet = row.reverbWet
+            sample.playbackMode = row.playbackMode
+            sample.sporadicMin = row.sporadicMin
+            sample.sporadicMax = row.sporadicMax
 
             samples.push(sample)
           })

src/components/NoisePage.vue

@@ -14,7 +14,7 @@
 
         <v-row justify="center">
           <v-btn
-            :disabled="playDisabled || !isTimerValid"
+            :disabled="playDisabled || !isTimerValid || !isSporadicValid"
             class="mx-3 mb-5"
             fab
             large
@@ -640,7 +640,7 @@
         v-if="canUpload"
         cols="12"
       >
-        <h2 class="display-1 font-weight-bold mb-5">
+        <h2 class="display-1 font-weight-bold mb-7">
           Samples
         </h2>
 
@@ -652,10 +652,15 @@
             <v-row
               justify="center"
             >
-              {{ sample.name }}
-            </v-row>
+              <v-col />
 
-            <v-row>
+              <v-col>
+                <h2 class="mb-5">
+                  {{ sample.name }}
+                </h2>
+              </v-col>
+
+              <v-col>
                 <v-btn
                   icon
                   :disabled="playDisabled"
@@ -663,7 +668,10 @@
                 >
                   <v-icon>mdi-delete</v-icon>
                 </v-btn>
+              </v-col>
+            </v-row>
 
+            <v-row>
               <v-slider
                 v-model="sample.volume"
                 label="Volume"
@@ -679,6 +687,160 @@
                 <p>{{ loadedSamples[index].volume }}</p>
               </div>
             </v-row>
+
+            <v-row
+              justify="center"
+            >
+              <h3 class="font-weight-regular mb-9">
+                Effects
+              </h3>
+            </v-row>
+
+            <v-expansion-panels class="mb-9">
+              <v-expansion-panel>
+                <v-expansion-panel-header>
+                  Reverb
+                </v-expansion-panel-header>
+                <v-expansion-panel-content>
+                  <v-row justify="center">
+                    <v-checkbox
+                      v-model="sample.reverbEnabled"
+                      :disabled="playDisabled"
+                      label="Enabled"
+                    />
+                  </v-row>
+
+                  <v-row justify="center">
+                    <v-slider
+                      v-model="sample.reverbPreDelay"
+                      :disabled="playDisabled || !sample.reverbEnabled"
+                      label="Pre Delay"
+                      thumb-label
+                      max="16"
+                      min="0"
+                      step="0.5"
+                      class="mx-3"
+                    />
+                    <div
+                      class="mx-3"
+                    >
+                      <p>{{ sample.reverbPreDelay }}</p>
+                    </div>
+                  </v-row>
+
+                  <v-row justify="center">
+                    <v-slider
+                      v-model="sample.reverbDecay"
+                      :disabled="playDisabled || !sample.reverbEnabled"
+                      label="Decay"
+                      thumb-label
+                      max="16"
+                      min="0"
+                      step="0.5"
+                      class="mx-3"
+                      @input="updateVolume"
+                    />
+                    <div
+                      class="mx-3"
+                    >
+                      <p> {{ sample.reverbDecay }}</p>
+                    </div>
+                  </v-row>
+
+                  <v-row justify="center">
+                    <v-slider
+                      v-model="sample.reverbWet"
+                      :disabled="playDisabled || !sample.reverbEnabled"
+                      label="Wet"
+                      thumb-label
+                      max="1"
+                      min="0"
+                      step="0.01"
+                      class="mx-3"
+                      @input="updateVolume"
+                    />
+                    <div
+                      class="mx-3"
+                    >
+                      <p>{{ sample.reverbWet }}%</p>
+                    </div>
+                  </v-row>
+                </v-expansion-panel-content>
+              </v-expansion-panel>
+            </v-expansion-panels>
+
+            <v-row justify="center">
+              <h3 class="font-weight-regular">
+                Playback Mode
+              </h3>
+            </v-row>
+
+            <v-row
+              justify="center"
+              class="mb-5"
+            >
+              <v-radio-group
+                v-model="sample.playbackMode"
+                :disabled="playDisabled"
+                mandatory
+              >
+                <v-radio
+                  label="Continuous"
+                  value="continuous"
+                />
+                <v-radio
+                  label="Sporadic"
+                  value="sporadic"
+                />
+              </v-radio-group>
+            </v-row>
+
+            <v-form
+              v-model="isSporadicValid"
+            >
+              <v-row
+                justify="center"
+              >
+                <v-text-field
+                  v-model="sample.sporadicMin"
+                  type="number"
+                  label="Sporadic Min"
+                  class="mx-3"
+                  :disabled="sample.playbackMode != 'sporadic' || playDisabled"
+                  :rules="[validateSporadicRange(sample)]"
+                />
+
+                <v-text-field
+                  v-model="sample.sporadicMax"
+                  type="number"
+                  label="Sporadic Max"
+                  class="mx-3"
+                  :disabled="sample.playbackMode != 'sporadic' || playDisabled"
+                  :rules="[validateSporadicRange(sample)]"
+                />
+              </v-row>
+            </v-form>
+
+            <v-row
+              justify="center"
+              class="my-7"
+            >
+              <p
+                v-if="sample.playbackMode != 'sporadic'"
+                class="text--disabled"
+              >
+                (Sample will play randomly, every {{ sample.sporadicMin }} to {{ sample.sporadicMax }} seconds)
+              </p>
+              <p
+                v-else
+              >
+                (Sample will play randomly, every {{ sample.sporadicMin }} to {{ sample.sporadicMax }} seconds)
+              </p>
+            </v-row>
+
+            <v-divider
+              class="mb-7"
+            />
           </v-container>
         </v-row>
 
@@ -851,7 +1013,7 @@
                     <v-checkbox
                       v-model="previewSampleLoopPointsEnabled"
                       :disabled="previewSamplePlaying"
-                      label="Use Loop Points"
+                      label="Use Loop Points (Continuous Playback Mode Only)"
                       @change="updatePreviewSampleLoopPoints"
                     />
                   </v-row>

src/components/noise.js

@@ -75,6 +75,7 @@ export default {
     unwatch: null,
     confirmSwitchProfileDialog: false,
     activeProfile: {},
+    isSporadicValid: false,
     errorSnackbar: false,
     errorSnackbarText: '',
     rules: {
@@ -123,6 +124,13 @@ export default {
 
       this.loadedSamples.forEach(s => {
         settings.push(s.volume)
+        settings.push(s.reverbEnabled)
+        settings.push(s.reverbPreDelay)
+        settings.push(s.reverbDecay)
+        settings.push(s.reverbWet)
+        settings.push(s.playbackMode)
+        settings.push(s.sporadicMin)
+        settings.push(s.sporadicMax)
       })
 
       return settings
@@ -183,8 +191,19 @@ export default {
         this.players.player(s.id).fadeIn = s.fadeIn
         if (s.loopPointsEnabled) {
           this.players.player(s.id).setLoopPoints(s.loopStart, s.loopEnd)
+        } else {
+          this.players.player(s.id).setLoopPoints(0, this.players.player(s.id).buffer.duration)
         }
         this.players.player(s.id).volume.value = s.volume
+
+        this.players.player(s.id).disconnect()
+        if (s.reverbEnabled) {
+          const reverb = new Tone.Reverb(s.reverbDecay).toDestination()
+          reverb.set({ preDelay: s.reverbPreDelay, wet: s.reverbWet })
+          this.players.player(s.id).connect(reverb)
+        } else {
+          this.players.player(s.id).toDestination()
+        }
       })
 
       if (this.isTimerEnabled) {
@@ -202,11 +221,36 @@ export default {
         this.noise.sync().start(0)
 
         this.loadedSamples.forEach(s => {
+          if (s.playbackMode === 'sporadic') {
+            this.players.player(s.id).loop = false
+
+            const maxInt = parseInt(s.sporadicMax, 10)
+            const minInt = parseInt(s.sporadicMin, 10)
+            const rand = Math.floor(Math.random() * (maxInt - minInt + 1) + minInt)
+
+            s.initialSporadicPlayInterval = setInterval(() => this.playSporadicSample(s.id), rand * 1000)
+          } else {
+            this.players.player(s.id).loop = true
             this.players.player(s.id).unsync().sync().start(0)
+          }
         })
       }
 
-      Tone.Transport.start()
+      Tone.Transport.start('+0.1')
+    },
+    playSporadicSample (id) {
+      const sample = this.loadedSamples.find(s => s.id === id)
+
+      clearInterval(sample.initialSporadicPlayInterval)
+      clearInterval(sample.sporadicInterval)
+
+      this.players.player(id).unsync().sync().start()
+
+      const maxInt = parseInt(sample.sporadicMax, 10)
+      const minInt = parseInt(sample.sporadicMin, 10)
+      sample.playNextTime = Math.floor(Math.random() * (maxInt - minInt + 1) + minInt)
+
+      sample.sporadicInterval = setInterval(() => this.playSporadicSample(id), sample.playNextTime * 1000)
     },
     stop () {
       clearInterval(this.transportInterval)
@@ -216,6 +260,13 @@ export default {
       clearInterval(this.timeRemainingInterval)
       this.timeRemaining = 0
       this.duration = 0
+
+      this.loadedSamples.forEach(s => {
+        if (s.playbackMode === 'sporadic') {
+          clearInterval(s.initialSporadicPlayInterval)
+          clearInterval(s.sporadicInterval)
+        }
+      })
     },
     startTimer () {
       this.timeRemaining -= 1
@@ -470,6 +521,8 @@ export default {
       this.checkedSamples.forEach(i => {
         const load = this.allSamples.find(e => e.id === i)
         load.volume = -10
+        load.sporadicMin = 30
+        load.sporadicMax = 300
         this.loadedSamples.push(load)
       })
 
@@ -771,16 +824,39 @@ export default {
         this.players.player(s.id).fadeIn = s.fadeIn
         if (s.loopPointsEnabled) {
           this.players.player(s.id).setLoopPoints(s.loopStart, s.loopEnd)
+        } else {
+          this.players.player(s.id).setLoopPoints(0, this.players.player(s.id).buffer.duration)
         }
         this.players.player(s.id).volume.value = s.volume
 
-        this.players.player(s.id).connect(this.recorder)
-        this.players.player(s.id).unsync().sync().start(0)
+        this.players.player(s.id).disconnect()
+        if (s.reverbEnabled) {
+          const reverb = new Tone.Reverb(s.reverbDecay).connect(this.recorder).toDestination()
+          reverb.set({ preDelay: s.reverbPreDelay, wet: s.reverbWet })
+          this.players.player(s.id).connect(reverb)
+        } else {
+          this.players.player(s.id).connect(this.recorder).toDestination()
+        }
       })
 
       this.noise.sync().start(0)
 
-      Tone.Transport.start()
+      this.loadedSamples.forEach(s => {
+        if (s.playbackMode === 'sporadic') {
+          this.players.player(s.id).loop = false
+
+          const maxInt = parseInt(s.sporadicMax, 10)
+          const minInt = parseInt(s.sporadicMin, 10)
+          const rand = Math.floor(Math.random() * (maxInt - minInt + 1) + minInt)
+
+          s.initialSporadicPlayInterval = setInterval(() => this.playSporadicSample(s.id), rand * 1000)
+        } else {
+          this.players.player(s.id).loop = true
+          this.players.player(s.id).unsync().sync().start(0)
+        }
+      })
+
+      Tone.Transport.start('+0.1')
     },
     async stopRecording () {
       const recording = await this.recorder.stop()
@@ -795,6 +871,14 @@ export default {
       anchor.click()
 
       clearInterval(this.recordingInterval)
+
+      this.loadedSamples.forEach(s => {
+        if (s.playbackMode === 'sporadic') {
+          clearInterval(s.initialSporadicPlayInterval)
+          clearInterval(s.sporadicInterval)
+        }
+      })
+
       this.recordingDialog = false
       this.stop()
     },
@@ -818,6 +902,15 @@ export default {
       this.selectedProfile = this.profileItems.find(p => p.text === this.activeProfile.name)
       this.updateProfile()
       this.confirmSwitchProfileDialog = false
+    },
+    validateSporadicRange (sample) {
+      const min = parseInt(sample.sporadicMin, 10)
+      const max = parseInt(sample.sporadicMax, 10)
+      if (isNaN(min) || isNaN(max) || max <= min || min <= 0 || max <= 0) {
+        return 'Invalid'
+      } else {
+        return true
+      }
     }
   }
 }