external-repos/noisedash
1
0
Fork 1
mirror of https://github.com/kaythomas0/noisedash.git synced 2025-11-15 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start implementing sample playback mode

Browse Source
This commit is contained in:
Kevin Thomas
2022-08-19 22:28:36 -07:00
parent 3dbbf4c85d
commit 3c738925bc
4 changed files with 181 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/boot/db.js
View File

@@ -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_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_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 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') db.run('PRAGMA user_version = 3')
} }

30
server/routes/profiles.js
View File

@@ -66,15 +66,21 @@ router.post('/profiles', (req, res) => {
reverb_enabled, reverb_enabled,
reverb_pre_delay, reverb_pre_delay,
reverb_decay, reverb_decay,
reverb_wet) reverb_wet,
VALUES (?, ?, ?, ?, ?, ?, ?)`, [ playback_mode,
sporadic_min,
sporadic_max)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
profileID, profileID,
s.id, s.id,
s.volume, s.volume,
s.reverbEnabled, s.reverbEnabled,
s.reverbPreDelay, s.reverbPreDelay,
s.reverbDecay, s.reverbDecay,
s.reverbWet s.reverbWet,
s.playbackMode,
s.sporadicMin,
s.sporadicMax
], ],
(err) => { (err) => {
if (err) { if (err) {
@@ -223,15 +229,21 @@ router.put('/profiles/:profileId', (req, res) => {
reverb_enabled, reverb_enabled,
reverb_pre_delay, reverb_pre_delay,
reverb_decay, reverb_decay,
reverb_wet) reverb_wet,
VALUES (?, ?, ?, ?, ?, ?, ?)`, [ playback_mode,
sporadic_min,
sporadic_max)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
req.params.profileId, req.params.profileId,
s.id, s.id,
s.volume, s.volume,
s.reverbEnabled, s.reverbEnabled,
s.reverbPreDelay, s.reverbPreDelay,
s.reverbDecay, s.reverbDecay,
s.reverbWet s.reverbWet,
s.playbackMode,
s.sporadicMin,
s.sporadicMax
], ],
(err) => { (err) => {
if (err) { if (err) {
@@ -383,6 +395,9 @@ router.get('/profiles/:profileId', (req, res) => {
profiles_samples.reverb_pre_delay as reverbPreDelay, profiles_samples.reverb_pre_delay as reverbPreDelay,
profiles_samples.reverb_decay as reverbDecay, profiles_samples.reverb_decay as reverbDecay,
profiles_samples.reverb_wet as reverbWet, 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, fade_in as fadeIn,
loop_points_enabled as loopPointsEnabled, loop_points_enabled as loopPointsEnabled,
loop_start as loopStart, loop_start as loopStart,
@@ -414,6 +429,9 @@ router.get('/profiles/:profileId', (req, res) => {
sample.reverbPreDelay = row.reverbPreDelay sample.reverbPreDelay = row.reverbPreDelay
sample.reverbDecay = row.reverbDecay sample.reverbDecay = row.reverbDecay
sample.reverbWet = row.reverbWet sample.reverbWet = row.reverbWet
sample.playbackMode = row.playbackMode
sample.sporadicMin = row.sporadicMin
sample.sporadicMax = row.sporadicMax
samples.push(sample) samples.push(sample)
}) })

203
src/components/NoisePage.vue
View File

@@ -14,7 +14,7 @@
<v-row justify="center"> <v-row justify="center">
<v-btn <v-btn
:disabled="playDisabled || !isTimerValid" :disabled="playDisabled || !isTimerValid || !isSporadicValid"
class="mx-3 mb-5" class="mx-3 mb-5"
fab fab
large large
@@ -640,7 +640,7 @@
v-if="canUpload" v-if="canUpload"
cols="12" cols="12"
> >
<h2 class="display-1 font-weight-bold mb-5"> <h2 class="display-1 font-weight-bold mb-7">
Samples Samples
</h2> </h2>
@@ -652,7 +652,7 @@
<v-row <v-row
justify="center" justify="center"
> >
<h2 class="headline font-weight-bold mb-5"> <h2 class="mb-5">
{{ sample.name }} {{ sample.name }}
</h2> </h2>
</v-row> </v-row>
@@ -685,80 +685,155 @@
<v-row <v-row
justify="center" justify="center"
> >
<h2 class="headline mb-5"> <h3 class="font-weight-regular mb-9">
Effects Effects
</h2> </h3>
</v-row> </v-row>
<v-row justify="center"> <v-expansion-panels class="mb-9">
<v-checkbox <v-expansion-panel>
v-model="sample.reverbEnabled" <v-expansion-panel-header>
label="Reverb" Reverb
/> </v-expansion-panel-header>
</v-row> <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"> <v-row justify="center">
<v-slider <h3 class="font-weight-regular">
v-model="sample.reverbPreDelay" Playback Mode
:disabled="!sample.reverbEnabled" </h3>
label="Pre Delay" </v-row>
thumb-label
max="16" <v-row
min="0" justify="center"
step="0.5" class="mb-5"
class="mx-3" >
@input="updateReverbPreDelay(sample.id, index)" <v-radio-group
/> v-model="sample.playbackMode"
<div mandatory
class="mx-3"
> >
<p>{{ sample.reverbPreDelay }}</p> <v-radio
</div> label="Continuous"
value="continuous"
/>
<v-radio
label="Sporadic"
value="sporadic"
/>
</v-radio-group>
</v-row> </v-row>
<v-row justify="center"> <v-form
<v-slider v-model="isSporadicValid"
v-model="sample.reverbDecay" >
:disabled="!sample.reverbEnabled" <v-row
label="Decay" justify="center"
thumb-label
max="16"
min="0"
step="0.5"
class="mx-3"
@input="updateVolume"
/>
<div
class="mx-3"
> >
<p> {{ sample.reverbDecay }}</p> <v-text-field
</div> v-model="sample.sporadicMin"
</v-row> type="number"
label="Sporadic Min"
class="mx-3"
:disabled="sample.playbackMode != 'sporadic'"
:rules="[rules.gt(0)]"
/>
<v-row justify="center"> <v-text-field
<v-slider v-model="sample.sporadicMax"
v-model="sample.reverbWet" type="number"
:disabled="!sample.reverbEnabled" label="Sporadic Max"
label="Wet" class="mx-3"
thumb-label :disabled="sample.playbackMode != 'sporadic'"
max="1" :rules="[rules.gt(0)]"
min="0" />
step="0.01" </v-row>
class="mx-3" </v-form>
@input="updateVolume"
/> <v-row
<div justify="center"
class="mx-3" class="my-7"
>
<p
v-if="sample.playbackMode != 'sporadic'"
class="text--disabled"
> >
<p>{{ sample.reverbWet }}%</p> (Sample will play randomly, every {{ sample.sporadicMin }} to {{ sample.sporadicMax }} seconds)
</div> </p>
<p
v-else
>
(Sample will play randomly, every {{ sample.sporadicMin }} to {{ sample.sporadicMax }} seconds)
</p>
</v-row> </v-row>
<v-row> <v-divider
<v-divider class="mb-7"
class="mb-7" />
/>
</v-row>
</v-container> </v-container>
</v-row> </v-row>

17
src/components/noise.js
View File

@@ -75,6 +75,7 @@ export default {
unwatch: null, unwatch: null,
confirmSwitchProfileDialog: false, confirmSwitchProfileDialog: false,
activeProfile: {}, activeProfile: {},
isSporadicValid: false,
errorSnackbar: false, errorSnackbar: false,
errorSnackbarText: '', errorSnackbarText: '',
rules: { rules: {
@@ -123,6 +124,10 @@ export default {
this.loadedSamples.forEach(s => { this.loadedSamples.forEach(s => {
settings.push(s.volume) settings.push(s.volume)
settings.push(s.reverbEnabled)
settings.push(s.reverbPreDelay)
settings.push(s.reverbDecay)
settings.push(s.reverbWet)
}) })
return settings return settings
@@ -186,10 +191,13 @@ export default {
} }
this.players.player(s.id).volume.value = s.volume this.players.player(s.id).volume.value = s.volume
this.players.player(s.id).disconnect()
if (s.reverbEnabled) { if (s.reverbEnabled) {
const reverb = new Tone.Reverb(s.reverbDecay).toDestination() const reverb = new Tone.Reverb(s.reverbDecay).toDestination()
reverb.set({ preDelay: s.reverbPreDelay, wet: s.reverbWet }) reverb.set({ preDelay: s.reverbPreDelay, wet: s.reverbWet })
this.players.player(s.id).connect(reverb) 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.noise.sync().start(0)
this.loadedSamples.forEach(s => { this.loadedSamples.forEach(s => {
this.players.player(s.id).unsync().sync().start(0) 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 () { stop () {
clearInterval(this.transportInterval) clearInterval(this.transportInterval)