changed note input to frequency or string format midi

Author: jvntf

examples/polyphonicSynth-Keyboard/sketch.js

@@ -6,6 +6,8 @@ var colors = {};
 var keys = {};
 var notes = {};
 
+var compressor;
+
 var description;
 function setup() {
 
@@ -17,15 +19,21 @@ function setup() {
     }
   }
 
-  keys = {'A':60, 'W':61, 'S':62, 'E':63, 'D':64, 'F':65, 'T':66,'G':67,
-          'Y':68, 'H':69, 'U':70, 'J':71, 'K':72, 'O':73, 'L':74};
-  notes = {60:0, 62:1 , 64:2 , 65:3 , 67:4 , 69:5 , 71:6 , 72:7 , 74:8,
-            61: 9, 63:10, 66:12, 68:13, 70:14, 73:16};
-  octave = 0;
+  keys = {'A':'C0', 'W':'C#0', 'S':'D0', 'E':'Eb0', 'D':'E0', 'F':'F0', 'T':'F#0','G':'G0',
+          'Y':'G#0', 'H':'A1', 'U':'Bb1', 'J':'B1', 'K':'C1', 'O':'C#1', 'L':'D1'};
+          
+  notes = {'C0':0, 'D0':1 , 'E0':2 , 'F0':3, 'G0':4 , 'A1':5 , 'B1':6 , 'C1':7 , 'D1':8,
+            'C#0': 9, 'Eb0':10, 'F#0':12, 'G#0':13, 'Bb1':14, 'C#1':16};          
+  octave = 3;
+
 
   description = createP('p5.PolySynth is a handler class for monophonic extensions '+
                 'of the p5.AudioVoice class. Use the computer keyboard to play notes on '+
                 'the piano roll. Use UP_ARROW and DOWN_ARROW to change octave');
+  polySynth.disconnect();
+  compressor = new p5.Compressor();
+  polySynth.connect(compressor);
+
 
 }
 
@@ -51,13 +59,18 @@ function draw() {
 function keyPressed() {
   //OCTAVEf
   if (keyCode === UP_ARROW) {
-  	octave +=12;
+  	octave +=1;
   } else if (keyCode === DOWN_ARROW) {
-  	octave -=12;
+  	octave -=1;
   }
   else if (keyToMidi() && keysDown[key] !== true){
-      polySynth.noteAttack(keyToMidi() + octave);
+      // var keyToMidi() = keyToMidi();
+      var currentOctave = Number(keyToMidi()[keyToMidi().length-1]) + octave;
+      var currentKey= keyToMidi().substr(0,keyToMidi().length -1) + currentOctave;
+
+      polySynth.noteAttack(currentKey);
       var index = notes[keyToMidi()];
+
       colors[index][1] = !colors[index][1];
       colors[index][1] ? colors[index][0] = color(random(255),random(255),random(255)) : colors[index][0] = color(255);
     if (keysDown[key] === undefined) {
@@ -68,9 +81,15 @@ function keyPressed() {
 
 function keyReleased() {
 	Object.keys(keysDown).forEach(function(key) {
-		if(!keyIsDown(key)){
-			polySynth.noteRelease(keyToMidi(key) + octave);
-      var index = notes[keyToMidi(key)];
+
+		if(!keyIsDown(key.charCodeAt(0))){
+     // var keyToMidi() = keyToMidi();
+
+      var currentOctave = Number(keyToMidi()[keyToMidi().length - 1]) + octave;
+      currentKey = keyToMidi().substr(0,keyToMidi().length -1) + currentOctave;	
+      polySynth.noteRelease(currentKey);
+
+      var index = notes[keyToMidi(keyCodeToLetter(key))];
       colors[index][1] = !colors[index][1];
       colors[index][1] ? colors[index][0] = color(random(255),random(255),random(255)) : colors[index][0] = color(255);
       delete keysDown[key];
@@ -81,4 +100,8 @@ function keyReleased() {
 function keyToMidi(keyboard) {
 	var thisKey = typeof keyboard ==='undefined' ? key : keyboard
   return keys[thisKey];
+}
+
+function keyCodeToLetter(code) {
+
 }

src/audioVoice.js

@@ -14,6 +14,15 @@ define(function() {
   };
 
   p5.AudioVoice.prototype._setNote = function(note) {
+    var wholeNotes = {A:21, B:23, C:24, D:26, E:28, F:29, G:31};
+
+    var value = wholeNotes[ note[0] ];
+    var octave = typeof Number(note.slice(-1)) === 'number'? note.slice(-1) : 0;
+    value += 12 * octave;
+    value = note[1] === '#' ? value+1 : note[1] ==='b' ? value - 1 : value;
+
+    //return midi value converted to frequency
+    return p5.prototype.midiToFreq(value);
   };
 
   p5.AudioVoice.prototype.play = function (note, velocity, secondsFromNow, sustime) {

src/monosynth.js

@@ -64,31 +64,15 @@ define(function (require) {
 
   p5.MonoSynth.prototype = Object.create(p5.AudioVoice.prototype);
 
-  /**
-   *  Used internally by play() and triggerAttack()
-   *  to set the note of this.oscillator to a MIDI value.
-   *
-   *  Synth creators with more complex setups may have overridden
-   *  the oscillator chain with more than one oscillator,
-   *  and should override this method accordingly.
-   *
-   *  @param   {Number} note           midi value of a note, where
-   *                                   middle c is 60
-   *  @param   {Number} [secondsFromNow] (optional) a time (in seconds
-   *                                     from now) at which
-   *                                     to set the note
-   *  @private
-   */
-  p5.MonoSynth.prototype._setNote = function(note, secondsFromNow) {
-    var freqVal = p5.prototype.midiToFreq(note);
-    this.oscillator.freq(freqVal, 0, secondsFromNow);
-  };
-
   /**
      *  Play tells the MonoSynth to start playing a note
      *
      *  @method play
-     *  @param  {Number} [note] midi note to play (ranging from 0 to 127 - 60 being a middle C)
+     *  @param {String | Number} note the note you want to play, specified as a 
+     *                                 frequency in Hertz (Number) or as a midi 
+     *                                 value in Note/Octave format ("C4", "Eb3"...etc")
+     *                                 See <a href = "https://github.com/Tonejs/Tone.js/wiki/Instruments">
+     *                                 Tone</a>. Defaults to 440 hz.
      *  @param  {Number} [velocity] velocity of the note to play (ranging from 0 to 1)
      *  @param  {Number} [secondsFromNow]  time from now (in seconds) at which to play
      *  @param  {Number} [sustainTime] time to sustain before releasing the envelope
@@ -99,7 +83,7 @@ define(function (require) {
     // set range of env (TO DO: allow this to be scheduled in advance)
     var susTime = susTime || this.sustain;
     this.susTime = susTime;
-    this.triggerAttack(note, veocity, secondsFromNow);
+    this.triggerAttack(note, velocity, secondsFromNow);
     this.triggerRelease(secondsFromNow + susTime);
   };
 
@@ -108,14 +92,20 @@ define(function (require) {
      *  Similar to holding down a key on a piano, but it will
      *  hold the sustain level until you let go.
      *
+     *  @param {String | Number} note the note you want to play, specified as a 
+     *                                 frequency in Hertz (Number) or as a midi 
+     *                                 value in Note/Octave format ("C4", "Eb3"...etc")
+     *                                 See <a href = "https://github.com/Tonejs/Tone.js/wiki/Instruments">
+     *                                 Tone</a>. Defaults to 440 hz
      *  @param  {Number} secondsFromNow time from now (in seconds)
      *  @param  {Number} [velocity] velocity of the note to play (ranging from 0 to 1)
      *  @param  {Number} [secondsFromNow]  time from now (in seconds) at which to play
      *  @method  triggerAttack
      */
   p5.MonoSynth.prototype.triggerAttack = function (note, velocity, secondsFromNow) {
     var secondsFromNow = secondsFromNow || 0;
-    var freq = p5.prototype.midiToFreq(note);
+    var freq = typeof note === 'string' ? this._setNote(note) 
+            : typeof note === 'number' ? note : 440;
     var vel = velocity || 1;
 
     this._isOn = true;
@@ -211,6 +201,7 @@ define(function (require) {
     },
   });
 
+
   /**
    * MonoSynth amp
    * @method  amp

src/polysynth.js

@@ -183,7 +183,10 @@ define(function (require) {
     //this value is used by this._voicesInUse
     var t = now + tFromNow;
 
-    var note = _note === undefined ?  60 : _note;
+    // var note = _note === undefined ?  60 : _note;
+    // 
+    var note = typeof _note === 'string' ? this.AudioVoice.prototype._setNote(_note) 
+            : typeof _note === 'number' ? _note : 440;
     var velocity = _velocity === undefined ? 1 : _velocity;
 
     var currentVoice;
@@ -242,11 +245,14 @@ define(function (require) {
    */  
 
   p5.PolySynth.prototype.noteRelease = function (_note,secondsFromNow) {
-    var note = _note === undefined ?
-      p5.prototype.freqToMidi(this.audiovoices[this._newest].oscillator.freq().value)
-      : _note;
+    // var note = _note === undefined ?
+    //   p5.prototype.freqToMidi(this.audiovoices[this._newest].oscillator.freq().value)
+    //   : _note;
+    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) {
+
+    if (this.notes[note] === undefined) {
       console.warn('Cannot release a note that is not already playing');
     } else {
       var now =  p5sound.audiocontext.currentTime;
@@ -259,7 +265,7 @@ define(function (require) {
       this._voicesInUse.setValueAtTime(previousVal - 1, t);
       this._updateAfter(t, -1);
 
-
+      // console.log('RELEASE ' + note);
       this.audiovoices[ this.notes[note] ].triggerRelease(tFromNow);
       this.notes[note] = undefined;