From 7f8d27956806e7376566b2394175f381921374a6 Mon Sep 17 00:00:00 2001 From: Mikhail Klimentov Date: Wed, 24 Aug 2016 00:53:36 -0400 Subject: [PATCH 1/6] Play button responding to spacebar; bug: un-focuses when clickaway from button --- demo/demo.js | 27 +++------------------------ demo/index.js | 2 +- public/index.html | 10 ++++++++++ 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/demo/demo.js b/demo/demo.js index d2a7f49..572af0e 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -56,7 +56,7 @@ export default class Demo extends Component { - - - @@ -104,7 +81,9 @@ export default class Demo extends Component { diff --git a/demo/index.js b/demo/index.js index c8aede6..8358155 100644 --- a/demo/index.js +++ b/demo/index.js @@ -5,4 +5,4 @@ import Demo from './demo'; ReactDOM.render( , document.getElementById('root') -); +); \ No newline at end of file diff --git a/public/index.html b/public/index.html index 7989c47..1d585db 100644 --- a/public/index.html +++ b/public/index.html @@ -7,5 +7,15 @@
+ \ No newline at end of file From 58fa380dc8858b2a2d235acd73be51789ad1c2c8 Mon Sep 17 00:00:00 2001 From: Mikhail Klimentov Date: Wed, 24 Aug 2016 01:28:10 -0400 Subject: [PATCH 2/6] Play button toggled by spacebar. --- demo/demo.js | 2 +- demo/index.js | 2 +- public/index.html | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/demo/demo.js b/demo/demo.js index 572af0e..3bb0b7e 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -56,7 +56,7 @@ export default class Demo extends Component { , document.getElementById('root') -); \ No newline at end of file +); \ No newline at end of file diff --git a/public/index.html b/public/index.html index 1d585db..d37b0e9 100644 --- a/public/index.html +++ b/public/index.html @@ -9,13 +9,21 @@ \ No newline at end of file From b17aec3254cc879817079ee1c8eddadad5105971 Mon Sep 17 00:00:00 2001 From: Ken Wheeler Date: Wed, 24 Aug 2016 17:00:02 -0400 Subject: [PATCH 3/6] Oh lawd --- demo/demo.js | 117 ++++++++++++++++++---------------- demo/polysynth.js | 45 +++++++++++++ demo/visualization.js | 43 +++++++++++++ package.json | 4 +- public/reverb/room.wav | Bin 0 -> 134372 bytes src/components/analyser.js | 9 --- src/components/bitcrusher.js | 50 +++++++++++++++ src/components/chorus.js | 53 +++++++++++++++ src/components/compressor.js | 11 +--- src/components/delay.js | 59 +++++++++++++++++ src/components/filter.js | 60 +++++++++++++++++ src/components/moog-filter.js | 50 +++++++++++++++ src/components/overdrive.js | 56 ++++++++++++++++ src/components/phaser.js | 58 +++++++++++++++++ src/components/ping-pong.js | 53 +++++++++++++++ src/components/reverb.js | 62 ++++++++++++++++++ src/components/sampler.js | 27 +++++--- src/components/sequencer.js | 32 +++++----- src/components/song.js | 48 ++++++-------- src/components/synth.js | 41 ++++++++---- src/index.js | 18 ++++++ 21 files changed, 754 insertions(+), 142 deletions(-) create mode 100644 demo/polysynth.js create mode 100644 demo/visualization.js create mode 100755 public/reverb/room.wav create mode 100644 src/components/bitcrusher.js create mode 100644 src/components/chorus.js create mode 100644 src/components/delay.js create mode 100644 src/components/filter.js create mode 100644 src/components/moog-filter.js create mode 100644 src/components/overdrive.js create mode 100644 src/components/phaser.js create mode 100644 src/components/ping-pong.js create mode 100644 src/components/reverb.js diff --git a/demo/demo.js b/demo/demo.js index d2a7f49..078a498 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -1,5 +1,25 @@ import React, { Component } from 'react'; -import { Analyser, Compressor, Song, Sequencer, Sampler, Synth } from '../src'; + +import { + Analyser, + Bitcrusher, + Chorus, + Compressor, + Delay, + Filter, + MoogFilter, + Overdrive, + Phaser, + PingPong, + Reverb, + Song, + Sequencer, + Sampler, + Synth, +} from '../src'; + +import Polysynth from './polysynth'; +import Visualization from './visualization'; import './index.css'; @@ -14,27 +34,8 @@ export default class Demo extends Component { this.audioProcess = this.audioProcess.bind(this); this.playToggle = this.playToggle.bind(this); } - componentDidMount() { - this.ctx = this.canvas.getContext('2d'); - } audioProcess(analyser) { - if (this.ctx) { - const gradient = this.ctx.createLinearGradient(0, 0, 0, 512); - gradient.addColorStop(1, '#000000'); - gradient.addColorStop(0.75, '#2ecc71'); - gradient.addColorStop(0.25, '#f1c40f'); - gradient.addColorStop(0, '#e74c3c'); - - const array = new Uint8Array(analyser.frequencyBinCount); - analyser.getByteFrequencyData(array); - this.ctx.clearRect(0, 0, 800, 512); - this.ctx.fillStyle = gradient; - - for (let i = 0; i < (array.length); i++) { - const value = array[i]; - this.ctx.fillRect(i * 12, 512, 10, value * -2); - } - } + this.visualization.audioProcess(analyser); } playToggle() { this.setState({ @@ -46,60 +47,64 @@ export default class Demo extends Component {
+ + + + - - - - - + - { this.canvas = c; }} - /> + { this.visualization = c; }} /> diff --git a/demo/index.js b/demo/index.js index c8aede6..8358155 100644 --- a/demo/index.js +++ b/demo/index.js @@ -5,4 +5,4 @@ import Demo from './demo'; ReactDOM.render( , document.getElementById('root') -); +); \ No newline at end of file diff --git a/public/index.html b/public/index.html index 7989c47..f955a31 100644 --- a/public/index.html +++ b/public/index.html @@ -7,5 +7,14 @@
+ \ No newline at end of file From be030d17b2360d190dfaa45c816eea0ef1d46e1b Mon Sep 17 00:00:00 2001 From: Mikhail Klimentov Date: Wed, 24 Aug 2016 01:28:10 -0400 Subject: [PATCH 5/6] Play button toggled by spacebar. --- demo/demo.js | 2 +- demo/index.js | 2 +- public/index.html | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/demo/demo.js b/demo/demo.js index 4319ae9..db1d9c1 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -104,7 +104,7 @@ export default class Demo extends Component { , document.getElementById('root') -); \ No newline at end of file +); \ No newline at end of file diff --git a/public/index.html b/public/index.html index f955a31..e530242 100644 --- a/public/index.html +++ b/public/index.html @@ -9,12 +9,18 @@ \ No newline at end of file From 7aab8631ee1ebd331b76079a9106a881e783b788 Mon Sep 17 00:00:00 2001 From: Mikhail Klimentov Date: Wed, 24 Aug 2016 20:48:30 -0400 Subject: [PATCH 6/6] Spacebar commit brought up to most recent 1.0.0 upstream commit --- demo/demo.js | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/demo.js b/demo/demo.js index db1d9c1..aa1bbb4 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -115,7 +115,6 @@ export default class Demo extends Component { steps={[0, 4, 8, 12, 16, 20, 24, 28]} /> -