From b9ef9b0a9bc6094c26551decb90ef76eb51b8fe5 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 21 Feb 2018 19:33:38 +0000 Subject: [PATCH] dreckiger commit --- .gitignore | 3 +++ src/.main.js.swp | Bin 12288 -> 0 bytes src/components/.Main.vue.swp | Bin 12288 -> 0 bytes src/components/Main.vue | 49 +++++++++++++++++++++++++++++------ 4 files changed, 44 insertions(+), 8 deletions(-) delete mode 100644 src/.main.js.swp delete mode 100644 src/components/.Main.vue.swp diff --git a/.gitignore b/.gitignore index 541a820..c5734d3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ yarn-error.log* *.ntvs* *.njsproj *.sln + +# vim +*.swp diff --git a/src/.main.js.swp b/src/.main.js.swp deleted file mode 100644 index 77ce78555cc889e3800d514c13eaa957f3f6a301..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&F>Vww6b4`i2|5UZ3p_|Mn{CX^Cr7XL6dDkzolQEwcpy~PugO%Q|;_Oc}jQ79VP9mQa?Vveg17d zs$X8IWZNL!xh>jk&MlIH*Jlgr*o8wr%B*KxHGHgFn`&KIZ~D%-icL;Bb+vAd_2pq& zWnt7n00JurTvm5(-#YuLZ``~=*RMTW;X5dS00bZa0SG_<0uX=z1pXI+9M{wvIn0H{ zfz}uO+F$+RBRU8`00Izz00bZa0SG_<0uX=z1pYw*(EDETS%-z8rqUnHL-A0)#%?<8mtfB*y_009U<00Izz00bZafmH-fHx*Il zHae4emx_CjV$=@`8LUGagJ+-9E}f7J)9JPhccIVR4Oi@>e#69AY%9+*+V6REqVyJV za@OZ@W0R>IlMmxzdP^%MC1oA_#J()$?ewOvvkiXFM!HWE;}R=nWz#M%cA-fZS}ICC z-?UiH4mY!$lIuU?vixHFxaUG?O{1>&*|t0m-o2vGQOd?Q#>v4pX=)Nx%$^cwvYzBU z`Dp5+vNCCYn>4d|O2(6M)}(S+aBs@PL8$8*`%+GN!D7Lbr F`VA9(rCR_1 diff --git a/src/components/.Main.vue.swp b/src/components/.Main.vue.swp deleted file mode 100644 index ff787d3b1dad3d0160104dc1f25591ca207ddd77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2J!~9B6vro!hL3!RR8UQh!nVZiI>beEtdGPfLP4@pm=6gW=62_NWADyvW@pbB zFf?hC0zo7Mg7j%9phOg;qN0Z)&>=ty1<>-}+1;G)Y%91U=$-W2*_nC!=Dq)XG&h6A zS1+ydbHO6R?<8Z-eS7WoA5Y}$FU?q?GK1p2zg#(SUn3a2=N*Q*H5+o%$#6>!5;+bt zRm9;yX;E5{4y15JSlBp>O_m!iHL9yZ>0n&Se=`W#kOHK@UIj`w?4CQu&OUp_Z}q1; zr}?QTUfF9$Eu;V`KnjooqyQ;E3XlS%04ealRlwy(*!#%tp(exgO?hOdY^qd{0;B*b zKnjooqyQ;E3XlS%04YEUkOHK@1E_#V7#lsp*wsf7JpTVb-{kP;3C8Y#+u#P+055?6 zoCJ4|Gxjt165IlxgU`T6UfD|AFNC8sdzo9@Bg@xNr>!<9qsIEofq{SPwU6L2E$z=k| z)7>t=kR-fQw{*C0&ZW?=U;c8@wT>$Y>rmuofJ#C>Knfgfl$ zE#Ve$dlpvFKT?YP}dcLPKJ&coTR;PS;-@84mR)Zk|XI4ewB!cl7Dy{aJq)fVzNs6fj z=0mQ`{g<)D6=|8Y>v3ig`kZ>ZWUS&teQB{>Qtb@)_*|j1oNL=#1$$hVY1+0ni*~xv zr?|VxN>^I#Hw8A6Xk*hNlNhGDzKvnzTe-20Cvqst)WMi3-0((AHCcRUO~&UOUgvN` zG+P$C*U2o$9O87~JPH#vu3qq}bY40>?q(*D>2jytTr&%$(^!XvOfma)4PTqQ+S7fU zCPJ^LG76gp?|af;Tq%V;xEJzGe;L)oOu}l#ZsWk&g%r_mbT3X-yt&+|&VWvT4bLd7 wyPKHzwZ+b^j8V*3kIwX0nmhD-rMg5Pg=j)P5j5j*DvDyclVK(hN;DDmA2am{8vp
-

Binaural Beats

+

Binaural Beats {{ started ? 'started' : 'stopped' }}

+ +
@@ -19,12 +30,24 @@ export default { name: 'Main', data () { return { + started: false, merge: null, leftEar: null, rightEar: null, waveform: 'sine', - left: 440, - right: 430 + preset: null, + presets: { + alpha: { + waveform: 'sine', + right: 150, + left: 155 + }, + beta: { + waveform: 'sine', + right: 130, + left: 139 + } + } } }, created () { @@ -38,22 +61,26 @@ export default { this.leftEar.frequency.value = 440 this.rightEar.frequency.value = 430 }, - updateWaveform: function () { - this.leftEar.type = this.waveform - this.rightEar.type = this.waveform - }, start: function () { this.leftEar.start() this.rightEar.start() + this.started = true }, stop: function () { this.leftEar.stop() this.rightEar.stop() + this.started = false } }, watch: { waveform: function () { - this.updateWaveform() + this.leftEar.type = this.waveform + this.rightEar.type = this.waveform + }, + preset: function () { + this.waveform = this.presets[this.preset].waveform + this.leftEar.frequency.value = this.presets[this.preset].left + this.rightEar.frequency.value = this.presets[this.preset].right } } } @@ -61,4 +88,10 @@ export default {