updated examples/polyphonic_synth to use new synth API and AudioVoice base class

Author: jvntf

examples/polyphonic_synth/sketch.js

@@ -1,15 +1,12 @@
-
-
-
 var psynth;
 
 var ptable_real,ptable_imag;
 var real_wave = [];
 var imag_wave = []
 
 function preload(){
-  ptable_real = loadStrings('Wurlitzer_2_real.txt'); 
-  ptable_imag = loadStrings('Wurlitzer_2_imag.txt' ); 
+  ptable_real = loadStrings('../polyphonic_synth/TwelveStringGuitar_real.txt'); 
+  ptable_imag = loadStrings('../polyphonic_synth/TwelveStringGuitar_imag.txt' ); 
 }
 
 
@@ -22,16 +19,16 @@ function setup() {
   frameRate(25);
 
 
-  psynth = new PolySynth(15,PeriodicWave);
+  // psynth = new PolySynth(15,PeriodicWave);
+  psynth = new p5.PolySynth(PeriodicWave, 8);
 
   for (var i = 0 ; i < 2048 ; i++) {
     real_wave[i] = float(ptable_real[i]);
-
   }
   for (var i = 0 ; i < 2048 ; i++) {
     imag_wave[i] = float(ptable_imag[i]);
-
   }
+
 
 }
 
@@ -44,81 +41,77 @@ function draw() {
 
 function mousePressed(){
 
-    var note = int(map(mouseX,0,width,60,84));
+    var note = int(map(mouseX,0,width,200,440));
     var length = map(mouseY,0,300,0,5);
-  
-  	psynth.setAdsr(0.021,0.025,length,0.025);
+
+
+
+    psynth.play(note,1,0,length);
+    psynth.noteADSR(note, 0.021,0.025,length,0.025);
+
+    var index = psynth.notes[note].getValueAtTime();
+    psynth.audiovoices[index].setParams({real: real_wave , imag: imag_wave});
 
     //  uncomment for SquareVoice detune parameters
     //var d = int(random(1,12));
     //psynth.setParams({detune: d });
 
     // uncomment for PeriodicWave
-    psynth.setParams({real: real_wave , imag: imag_wave});
-
-  	psynth.setNote(note);
-    psynth.play();
+    //psynth.setParams({real: real_wave , imag: imag_wave});
+    
 
 }
 
 
 //////////////////////////////////////////////////////////////////////////////
 function PeriodicWave(params){
-    AudioVoice.call(this);
+    p5.MonoSynth.call(this);
 
     this.real = new Float32Array([0,0]) ;
     this.imag = new Float32Array([0,1]);
-    
-    this.context = getAudioContext();
 
-    this.wt = this.context.createPeriodicWave(this.real,this.imag);
+    this.wt = this.ac.createPeriodicWave(this.real,this.imag);
 
-    this.oscillator = this.context.createOscillator();
-    this.oscillator.setPeriodicWave(this.wt);
+    // this.oscillator = this.context.createOscillator();
+    this.oscillator.oscillator.setPeriodicWave(this.wt);
+    this.filter.setType('lowpass');
+    this.filter.set(22050,5);
 
-    this.oscillator.disconnect();
-    this.oscillator.start();
-
-    this.oscillator.connect(this.filter);
-
-  this.setNote = function(note){
-      this.oscillator.frequency.value = midiToFreq(note);      
-  }
+    this.env.connect(this.filter);
 
   this.setParams = function(params){
-     // console.log(params.real);
       this.real = new Float32Array(params.real);
       this.imag = new Float32Array(params.imag);
-      this.wt = this.context.createPeriodicWave(this.real, this.imag);
-      this.oscillator.setPeriodicWave(this. wt);
+      this.wt = this.ac.createPeriodicWave(this.real, this.imag);
+      this.oscillator.oscillator.setPeriodicWave(this. wt);
   }
+  this.setADSR = function(a,d,s,r) {
+      this.attack = a;
+      this.decay=d;
+      this.sustain=s;
+      this.release=r;
+      this.volume = 1
+     this.env.set(this.attack, this.volume, this.decay, this.volume, this.release, this.volume); 
+      // this.env.set(this.attack, this.decay,  this.sustain, this.release); 
+      this.env.play(this.filter);
 
+  }
 
 }
 
-PeriodicWave.prototype = Object.create(AudioVoice.prototype); 
+PeriodicWave.prototype = Object.create(p5.MonoSynth.prototype); 
 PeriodicWave.prototype.constructor = PeriodicWave;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 // A typical synth class which inherits from AudioVoice class
 function SquareVoice(){
 
-  AudioVoice.call(this);
-
-  this.osctype = 'square';
-  this.oscillator = new p5.Oscillator(this.note,this.osctype);
-  this.oscillator.disconnect();
-  this.oscillator.start();
+  p5.MonoSynth.call(this);
 
-  this.oscillator.connect(this.filter);
-
-  this.setNote = function(note){
-    this.note = note;
-    this.oscillator.freq(midiToFreq(note));
-  } 
+  this.oscillator.setType('square');
 }
-SquareVoice.prototype = Object.create(AudioVoice.prototype);  // browsers support ECMAScript 5 ! warning for compatibility with older browsers
+SquareVoice.prototype = Object.create(p5.MonoSynth.prototype);  // browsers support ECMAScript 5 ! warning for compatibility with older browsers
 SquareVoice.prototype.constructor = SquareVoice;
 
 //////////////////////////////////////////////////////////////////////////////////////////////
@@ -150,101 +143,5 @@ function DetunedOsc(){
   }
 }
 
-DetunedOsc.prototype = Object.create(AudioVoice.prototype); 
+DetunedOsc.prototype = Object.create(p5.AudioVoice.prototype); 
 DetunedOsc.prototype.constructor = DetunedOsc;
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////
-// A super AudioVoice class to talk to the PolySynth class
-function AudioVoice () {
-
-  this.osctype = 'sine';
-  this.volume= 0.33;
-  this.note = 60;
-
-  this.attack = 0.25;
-  this.decay=0.25;
-  this.sustain=0.95;
-  this.release=0.25;
-  this.env = new p5.Env(this.attack,this.volume, this.decay,this.volume,  this.sustain, this.volume,this.release);
-
-  this.filter = new p5.LowPass();
-  this.filter.set(22050, 5);
-  
-  this.env.connect(this.filter);
-
-} 
-
-AudioVoice.prototype.voicePlay = function (){
-  this.env.play(this.filter);
-}
-
-AudioVoice.prototype.attackPlay = function (){
-  this.env.triggerAttack(this.oscillator);
-}
-
-AudioVoice.prototype.releasePlay = function (){
-  this.env.triggerRelease(this.oscillator);
-}
-
-AudioVoice.prototype.setNote = function(){
-
-}
-
-AudioVoice.prototype.setParams = function(params){
-
-}
-
-
-AudioVoice.prototype.setAdsr = function (a,d,s,r){
-  this.attack = a;
-  this.decay=d;
-  this.sustain=s;
-  this.release=r;
-  this.env = new p5.Env(this.attack, this.decay,  this.sustain, this.release); 
-  this.env.play(this.filter);
-}
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// a class to deal with voices allocations, of notes, parameters etc.
-// should be abastracted from the user
-function PolySynth(num,synthVoice){
-  this.voices = [];
-  this.num_voices = num;
-  this.poly_counter=0;
-
-  this.allocateVoices(synthVoice);
-}
-
-PolySynth.prototype.allocateVoices = function(synthVoice){
-  for (var i = 0 ; i < this.num_voices ; i++){
-       this.voices.push(new synthVoice());
-  }
-}
-
-PolySynth.prototype.play = function (){
-    this.voices[this.poly_counter].voicePlay();
-    this.poly_counter += 1;
-    this.poly_counter = this.poly_counter % this.num_voices;
-}
-
-PolySynth.prototype.setAdsr = function (a,d,s,r){
-  this.voices[this.poly_counter].setAdsr(a,d,s,r);
-}
-
-PolySynth.prototype.setNote = function (note){
-  this.voices[this.poly_counter].setNote(note);
-}
-
-PolySynth.prototype.setParams = function (params){
-  this.voices[this.poly_counter].setParams(params);
-}
-
-
-

src/monosynth.js

@@ -47,8 +47,8 @@ define(function (require) {
     this.filter.set(5, 1);
 
     // oscillator --> env --> filter --> this.output (gain) --> p5.soundOut
-
-    // this.oscillator.connect(this.filter);
+    this.oscillator.disconnect();
+    this.oscillator.connect(this.filter);
     this.env.setInput(this.oscillator);
     this.filter.connect(this.output);
 

src/polysynth.js

@@ -103,6 +103,7 @@ define(function (require) {
    *  @param  {Number} [sustainTime] time to sustain before releasing the envelope
    */
   p5.PolySynth.prototype.play = function (note,velocity, secondsFromNow, susTime) {
+    var susTime = susTime || 1;
     this.noteAttack(note, velocity, secondsFromNow);
     this.noteRelease(note, secondsFromNow + susTime);
   };
@@ -131,8 +132,11 @@ define(function (require) {
    *  @param {Number} [releaseTime]   Time in seconds from now (defaults to 0)
    **/
 
-  p5.PolySynth.prototype.noteADSR = function (note,a,d,s,r) {
-    this.audiovoices[ this.notes[note] ].setADSR(a,d,s,r);
+  p5.PolySynth.prototype.noteADSR = function (note,a,d,s,r,timeFromNow) {
+    var now = p5sound.audiocontext.currentTime;
+    var timeFromNow = timeFromNow || 0;
+    var t = now + timeFromNow
+    this.audiovoices[ this.notes[note].getValueAtTime(t) ].setADSR(a,d,s,r);
   };
 
 
@@ -191,7 +195,7 @@ define(function (require) {
     var currentVoice;
 
     //Release the note if it is already playing
-    if (this.notes[note] !== undefined) {
+    if ( this.notes[note] !== undefined && this.notes[note].getValueAtTime(t) !== null) {
       this.noteRelease(note,0);
     }
 
@@ -211,7 +215,9 @@ define(function (require) {
 
     //Overrite the entry in the notes object. A note (frequency value) 
     //corresponds to the index of the audiovoice that is playing it
-    this.notes[note] = currentVoice;
+
+    this.notes[note] = new TimelineSignal();
+    this.notes[note].setValueAtTime(currentVoice,t);
 
     //Find the scheduled change in this._voicesInUse that will be previous to this new note
     //Add 1 and schedule this value at time 't', when this note will start playing
@@ -265,23 +271,26 @@ define(function (require) {
     var note = typeof _note === 'string' ? this.AudioVoice.prototype._setNote(_note)
       : typeof _note === 'number' ? _note : this.audiovoices[this._newest].oscillator.freq().value;
 
-    if (this.notes[note] === undefined) {
-      console.warn('Cannot release a note that is not already playing');
-    } else {
       var now =  p5sound.audiocontext.currentTime;
       var tFromNow = secondsFromNow || 0;
       var t = now + tFromNow;
 
+    
+    if (this.notes[note].getValueAtTime(t) === null) {
+      console.warn('Cannot release a note that is not already playing');
+    } else {
+      
+
       //Find the scheduled change in this._voicesInUse that will be previous to this new note
       //subtract 1 and schedule this value at time 't', when this note will stop playing
       var previousVal = this._voicesInUse._searchBefore(t) === null ? 0 : this._voicesInUse._searchBefore(t).value;
       this._voicesInUse.setValueAtTime(previousVal - 1, t);
       //Then update all scheduled values that follow to decrease by 1
       this._updateAfter(t, -1);
 
-      // console.log('RELEASE ' + note);
-      this.audiovoices[ this.notes[note] ].triggerRelease(tFromNow);
-      this.notes[note] = undefined;
+      this.audiovoices[ this.notes[note].getValueAtTime(t) ].triggerRelease(tFromNow);
+      
+      this.notes[note].setValueAtTime( null, t);
 
       this._newest = this._newest === 0 ? 0 : (this._newest - 1) % (this.polyValue - 1);
     }