Skip to content

Commit

Permalink
update examples
Browse files Browse the repository at this point in the history
  • Loading branch information
@mohayonao
mohayonao committed Dec 18, 2014
1 parent 0ad0113 commit 10119a9
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 48 deletions.
12 changes: 6 additions & 6 deletions examples/8bit-sequencer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ <h3 class="panel-title">source</h3>
</div>

<script id="example">
var Neume = neume(new AudioContext());
var neu = neume(new AudioContext());

var visualizer = null; // gretro: http://mohayonao.github.io/gretro/

// create a PeriodicWave from the array
var famiconTriangle = Neume.Buffer.from([
var famiconTriangle = neu.Buffer.from([
+0.000, +0.125, +0.250, +0.375, +0.500, +0.625, +0.750, +0.875,
+0.875, +0.750, +0.625, +0.500, +0.375, +0.250, +0.125, +0.000,
-0.125, -0.250, -0.375, -0.500, -0.625, -0.750, -0.875, -1.000,
Expand Down Expand Up @@ -109,14 +109,14 @@ <h3 class="panel-title">source</h3>
var players = [];

function start(score) {
var timer = Neume.Interval("16n", function(e) {
var timer = neu.Interval("16n", function(e) {
var index = e.count % 32;

instruments.forEach(function(instrument, i) {
if (score[i][index].checked) {
var arg = _.wrapAt(instrument.arg, index);

Neume.Synth(instrument.func, arg).start(e.playbackTime);
neu.Synth(instrument.func, arg).start(e.playbackTime);
}
});
});
Expand Down Expand Up @@ -214,7 +214,7 @@ <h3 class="panel-title">source</h3>

var canvas = document.getElementById("canvas");

visualizer = new WaveVisualizer(Neume.analyser, {
visualizer = new WaveVisualizer(neu.analyser, {
canvas: canvas, width: $(canvas).width(), height: 240
});

Expand Down Expand Up @@ -242,7 +242,7 @@ <h3 class="panel-title">source</h3>
},
methods: {
toggle: function() {
Neume.reset();
neu.reset();
this.isPlaying = !this.isPlaying;
if (this.isPlaying) {
start(this.$data.score);
Expand Down
15 changes: 8 additions & 7 deletions examples/audio-graph-viewer/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,34 @@ <h1>neume.js audio-graph-viewer</h1>
<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.7.0/underscore-min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/4.8.0/codemirror.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/4.8.0/mode/javascript/javascript.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/4.8.0/addon/edit/matchbrackets.min.js"></script>
<script src="//mohayonao.github.io/web-audio-test-api/build/web-audio-test-api.js"></script>
<script src="../../build/neume.js"></script>
<script>
window.onload = function() {
"use strict";
_.mixin(neume._.exports());

window.Neume = neume(new AudioContext());
window.neu = neume(new AudioContext());

var editor = CodeMirror.fromTextArea(document.getElementById("editor"), {
mode: "javascript", theme: "monokai", workTime: 200, lineNumbers: true,
mode: "javascript", theme: "monokai", workTime: 200, lineNumbers: true, matchBrackets: true,
});
var result = CodeMirror.fromTextArea(document.getElementById("result"), {
mode: "javascript", theme: "monokai", readOnly: true
mode: "javascript", theme: "monokai", readOnly: true, matchBrackets: true,
});

var timerId = 0;
var prevVal = "";

function reset() {
clearInterval(timerId);
Neume.audioContext.$reset();
Neume.reset();
neu.audioContext.$reset();
neu.reset();
}

function update(node) {
Neume.audioContext.$process(0.125);
neu.audioContext.$process(0.125);
var value = JSON.stringify(node.toJSON().inputs, null, 2);
if (value !== prevVal) {
result.setValue(value);
Expand All @@ -70,7 +71,7 @@ <h1>neume.js audio-graph-viewer</h1>
reset();
eval.call(null, editor.getValue());

var node = Neume.context.getAudioBus(0).toAudioNode();
var node = neu.context.getAudioBus(0).toAudioNode();

update(node);
timerId = setInterval(function() {
Expand Down
14 changes: 7 additions & 7 deletions examples/buffer-work.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ <h3 class="panel-title">source</h3>
</div>

<script id="example">
var Neume = neume(new AudioContext());
var neu = neume(new AudioContext());

var visualizer = null; // three.js: http://threejs.org/

var buffer = null;
Neume.Buffer.load("./amen.wav").then(function(result) {
neu.Buffer.load("./amen.wav").then(function(result) {
buffer = result;
}).catch(function(e) {
console.error("Neume.Buffer.load: failed");
console.error("neu.Buffer.load: failed");
});

function Granular($, buffer, depth) {
Expand Down Expand Up @@ -112,11 +112,11 @@ <h3 class="panel-title">source</h3>
var players = [];

function start() {
Neume.context.reset();
neu.context.reset();

if (buffer) {
players = [ Neume.Interval(0.500, function(e) {
Neume.Synth(Granular, buffer, 4).start(e.playbackTime);
players = [ neu.Interval(0.500, function(e) {
neu.Synth(Granular, buffer, 4).start(e.playbackTime);
}), visualizer ];
}

Expand Down Expand Up @@ -268,7 +268,7 @@ <h3 class="panel-title">source</h3>
});
canvas.$offset = canvas.offset();

visualizer = new WaveVisualizer(Neume.analyser, { width: canvas.width(), height: 240 });
visualizer = new WaveVisualizer(neu.analyser, { width: canvas.width(), height: 240 });

visualizer.camera.position.set(0, 0, -300);

Expand Down
9 changes: 5 additions & 4 deletions examples/editor/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ <h1>neume.js editor</h1>
<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.7.0/underscore-min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/4.8.0/codemirror.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/4.8.0/mode/javascript/javascript.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/4.8.0/addon/edit/matchbrackets.min.js"></script>
<script src="//cdn.jsdelivr.net/es6-promise/1.0.0/promise.min.js"></script>
<script src="../../build/neume.js"></script>
<script>
Expand All @@ -39,19 +40,19 @@ <h1>neume.js editor</h1>

_.mixin(neume._.exports());

window.Neume = neume(new AudioContext());
window.neu = neume(new AudioContext());

var editor = CodeMirror.fromTextArea(document.getElementById("editor"), {
mode: "javascript", theme: "monokai", workTime: 200, lineNumbers: true,
mode: "javascript", theme: "monokai", workTime: 200, lineNumbers: true, matchBrackets: true,
});

document.getElementById("run").addEventListener("click", function() {
Neume.reset();
neu.reset();
eval.call(null, editor.getValue());
}, false);

document.getElementById("stop").addEventListener("click", function() {
Neume.reset();
neu.reset();
}, false);

document.getElementById("link").addEventListener("click", function() {
Expand Down
6 changes: 3 additions & 3 deletions examples/metronome.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<body>
<button id="start">start</button>
<script>
var Neume = neume(new AudioContext());
var neu = neume(new AudioContext());

function Sine($, freq, dur) {
return $("sin", { freq: freq })
Expand All @@ -20,11 +20,11 @@
timer.stop();
timer = null;
} else {
timer = Neume.Interval("4n", function(e) {
timer = neu.Interval("4n", function(e) {
var freq = [ 880, 440, 440, 440 ][e.count % 4];
var dur = [ 0.5, 0.125, 0.125, 0.125 ][e.count % 4];

Neume.Synth(Sine, freq, dur).start(e.playbackTime);
neu.Synth(Sine, freq, dur).start(e.playbackTime);
}).start();
}
}
Expand Down
14 changes: 7 additions & 7 deletions examples/mml-piano.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h3 class="panel-title">source</h3>
</div>

<script id="example">
var Neume = neume(new AudioContext());
var neu = neume(new AudioContext());

var mmlData = null;
var mmlEmitter = null; // MMLEmitter: http://mohayonao.github.io/mml-emitter/
Expand All @@ -58,7 +58,7 @@ <h3 class="panel-title">source</h3>
data[i] *= i < spec.room ? 1 : 0.05;
}

return Neume.Buffer.from(data);
return neu.Buffer.from(data);
}

function Piano($, freq, dur) {
Expand All @@ -82,17 +82,17 @@ <h3 class="panel-title">source</h3>
function start() {
var irData = new IRData({ room: _.sample([ 32, 128, 256, 512, 1024, 8192 ]), length: 65536 });

mmlEmitter = new MMLEmitter(Neume.context, mmlData);
mmlEmitter = new MMLEmitter(neu.context, mmlData);

mmlEmitter.tracks.forEach(function(track) {
track.on("note", function(e) {
// routing: Piano[output:0] -> Reverb[input:0] -> destination
Neume.Synth(Piano, e.frequency, e.duration).start(e.playbackTime);
neu.Synth(Piano, e.frequency, e.duration).start(e.playbackTime);
visualizer.push(e);
});
});

players = [ Neume.Synth(Destination, irData), mmlEmitter, visualizer ];
players = [ neu.Synth(Destination, irData), mmlEmitter, visualizer ];

players.forEach(function(player) {
player.start();
Expand Down Expand Up @@ -226,7 +226,7 @@ <h3 class="panel-title">source</h3>
});
canvas.$offset = canvas.offset();

visualizer = new MMLVisualizer(Neume.analyser, { width: canvas.width(), height: 240 });
visualizer = new MMLVisualizer(neu.analyser, { width: canvas.width(), height: 240 });

visualizer.camera.position.set(0, -100, -75);

Expand All @@ -239,7 +239,7 @@ <h3 class="panel-title">source</h3>
},
methods: {
toggle: function() {
Neume.reset();
neu.reset();
this.isPlaying = !this.isPlaying;
if (this.isPlaying) {
start();
Expand Down
16 changes: 8 additions & 8 deletions examples/rendering-reich.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h3 class="panel-title">source</h3>
</div>

<script id="example">
var Neume = neume(new AudioContext());
var neu = neume(new AudioContext());

var visualizer = null;

Expand Down Expand Up @@ -75,20 +75,20 @@ <h3 class="panel-title">source</h3>
function start() {
score = _.shuffle(score);

Neume.render(2.000, function(Neume) {
Neume.Interval(0.250, function(e) {
neu.render(2.000, function(neu) {
neu.Interval(0.250, function(e) {
var index = _.wrapAt(score, e.count) >> 1;
Neume.Synth(Pluck, freqs[index]).start(e.playbackTime);
neu.Synth(Pluck, freqs[index]).start(e.playbackTime);
}).start();
}).then(function(buffer) {
rates.forEach(function(rate) {
Neume.Synth(Tape, buffer, rate).start();
neu.Synth(Tape, buffer, rate).start();
});
}).catch(function(e) {
console.error(e);
});

players = [ Neume.Synth(Destination), visualizer ];
players = [ neu.Synth(Destination), visualizer ];

players.forEach(function(player) {
player.start();
Expand Down Expand Up @@ -204,7 +204,7 @@ <h3 class="panel-title">source</h3>

var canvas = document.getElementById("canvas");

visualizer = new WaveVisualizer(Neume.analyser, {
visualizer = new WaveVisualizer(neu.analyser, {
canvas: canvas, width: $(canvas).width(), height: 240
});

Expand All @@ -215,7 +215,7 @@ <h3 class="panel-title">source</h3>
},
methods: {
toggle: function() {
Neume.reset();
neu.reset();
this.isPlaying = !this.isPlaying;
if (this.isPlaying) {
start();
Expand Down
12 changes: 6 additions & 6 deletions examples/sine-storm.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h3 class="panel-title">source</h3>
</div>

<script id="example">
var Neume = neume(new AudioContext());
var neu = neume(new AudioContext());

var visualizer = null;
var sines = [];
Expand All @@ -61,16 +61,16 @@ <h3 class="panel-title">source</h3>
var players = [];

function start() {
var delay = Neume.Synth(FBDelay);
var timer = Neume.Sched(function() {
var delay = neu.Synth(FBDelay);
var timer = neu.Sched(function() {
var duration = compose();

sines = _.range(7).map(function() {
var freq = _.midicps(root + _.sample(chord) + _.sample([ 0, 12, 24, 36 ]));
var mod = _.exprand(0.01, 500.0);
var amp = _.exprand(0.01, 0.075);

return Neume.Synth(Sine, freq, mod, amp)
return neu.Synth(Sine, freq, mod, amp)
.fadeIn("now", 1).fadeOut("+" + duration, 1);
});

Expand Down Expand Up @@ -198,7 +198,7 @@ <h3 class="panel-title">source</h3>

var canvas = document.getElementById("canvas");

visualizer = new WaveVisualizer(Neume.analyser, {
visualizer = new WaveVisualizer(neu.analyser, {
canvas: canvas, width: $(canvas).width(), height: 240
});

Expand All @@ -209,7 +209,7 @@ <h3 class="panel-title">source</h3>
},
methods: {
toggle: function() {
Neume.reset();
neu.reset();
this.isPlaying = !this.isPlaying;
if (this.isPlaying) {
start(this.$data.score);
Expand Down

0 comments on commit 10119a9

Please sign in to comment.