Start implementing sample playback mode

server/boot/db.js

@@ -79,6 +79,9 @@ module.exports = function () {
           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

@@ -66,15 +66,21 @@ router.post('/profiles', (req, res) => {
           reverb_enabled,
           reverb_pre_delay,
           reverb_decay,
-          reverb_wet)
+          reverb_wet,
-          VALUES (?, ?, ?, ?, ?, ?, ?)`, [
+          playback_mode,
+          sporadic_min,
+          sporadic_max)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
           profileID,
           s.id,
           s.volume,
           s.reverbEnabled,
           s.reverbPreDelay,
           s.reverbDecay,
-          s.reverbWet
+          s.reverbWet,
+          s.playbackMode,
+          s.sporadicMin,
+          s.sporadicMax
         ],
         (err) => {
           if (err) {
@@ -223,15 +229,21 @@ router.put('/profiles/:profileId', (req, res) => {
             reverb_enabled,
             reverb_pre_delay,
             reverb_decay,
-            reverb_wet)
+            reverb_wet,
-            VALUES (?, ?, ?, ?, ?, ?, ?)`, [
+            playback_mode,
+            sporadic_min,
+            sporadic_max)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
             req.params.profileId,
             s.id,
             s.volume,
             s.reverbEnabled,
             s.reverbPreDelay,
             s.reverbDecay,
-            s.reverbWet
+            s.reverbWet,
+            s.playbackMode,
+            s.sporadicMin,
+            s.sporadicMax
           ],
           (err) => {
             if (err) {
@@ -383,6 +395,9 @@ router.get('/profiles/:profileId', (req, res) => {
           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,
@@ -414,6 +429,9 @@ router.get('/profiles/:profileId', (req, res) => {
             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,7 +652,7 @@
             <v-row
               justify="center"
             >
-              <h2 class="headline font-weight-bold mb-5">
+              <h2 class="mb-5">
                 {{ sample.name }}
               </h2>
             </v-row>
@@ -685,29 +685,35 @@
             <v-row
               justify="center"
             >
-              <h2 class="headline mb-5">
+              <h3 class="font-weight-regular mb-9">
                 Effects
-              </h2>
+              </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"
-                label="Reverb"
+                      :disabled="playDisabled"
+                      label="Enabled"
                     />
                   </v-row>
 
                   <v-row justify="center">
                     <v-slider
                       v-model="sample.reverbPreDelay"
-                :disabled="!sample.reverbEnabled"
+                      :disabled="playDisabled || !sample.reverbEnabled"
                       label="Pre Delay"
                       thumb-label
                       max="16"
                       min="0"
                       step="0.5"
                       class="mx-3"
-                @input="updateReverbPreDelay(sample.id, index)"
                     />
                     <div
                       class="mx-3"
@@ -719,7 +725,7 @@
                   <v-row justify="center">
                     <v-slider
                       v-model="sample.reverbDecay"
-                :disabled="!sample.reverbEnabled"
+                      :disabled="playDisabled || !sample.reverbEnabled"
                       label="Decay"
                       thumb-label
                       max="16"
@@ -738,7 +744,7 @@
                   <v-row justify="center">
                     <v-slider
                       v-model="sample.reverbWet"
-                :disabled="!sample.reverbEnabled"
+                      :disabled="playDisabled || !sample.reverbEnabled"
                       label="Wet"
                       thumb-label
                       max="1"
@@ -753,12 +759,81 @@
                       <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"
+                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'"
+                  :rules="[rules.gt(0)]"
+                />
+
+                <v-text-field
+                  v-model="sample.sporadicMax"
+                  type="number"
+                  label="Sporadic Max"
+                  class="mx-3"
+                  :disabled="sample.playbackMode != 'sporadic'"
+                  :rules="[rules.gt(0)]"
+                />
+              </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-row>
             <v-divider
               class="mb-7"
             />
-            </v-row>
           </v-container>
         </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,10 @@ 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)
       })
 
       return settings
@@ -186,10 +191,13 @@ export default {
         }
         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()
         }
       })
 
@@ -208,11 +216,16 @@ export default {
         this.noise.sync().start(0)
 
         this.loadedSamples.forEach(s => {
+          if (s.playbackMode === 'sporadic') {
+            const playNextTime = Math.floor(Math.random() * (s.sporadicMax - s.sporadicMin + 1) + s.sporadicMin)
+            this.sporadicInterval = setInterval(() => console.log('Test'), playNextTime)
+          } else {
             this.players.player(s.id).unsync().sync().start(0)
+          }
         })
       }
 
-      Tone.Transport.start()
+      Tone.Transport.start('+0.1')
     },
     stop () {
       clearInterval(this.transportInterval)