Mirrors/Tone.js
2
0
Fork 0
mirror of https://github.com/Tonejs/Tone.js synced 2024-11-16 08:38:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

notes start at C instead of A

Browse source
This commit is contained in:
Yotam Mann 2014-08-20 20:46:28 -04:00
parent 9819c07390
commit 41e3e877d2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Tone/core/Tone.js
View file

@ -404,12 +404,12 @@ define("Tone/core/Tone", [], function(){
// MUSIC NOTES
///////////////////////////////////////////////////////////////////////////
var noteToIndex = { "a" : 0, "a#" : 1, "bb" : 1, "b" : 2, "c" : 3, "c#" : 4,
"db" : 4, "d" : 5, "d#" : 6, "eb" : 6, "e" : 7, "f" : 8, "f#" : 9,
"gb" : 9, "g" : 10, "g#" : 11, "ab" : 11
var noteToIndex = { "c" : 0, "c#" : 1, "db" : 1, "d" : 2, "d#" : 3, "eb" : 3,
"e" : 4, "f" : 5, "f#" : 6, "gb" : 6, "g" : 7, "g#" : 8, "ab" : 8,
"a" : 9, "a#" : 10, "bb" : 10, "b" : 11
};
var noteIndexToNote = ["A", "A#", "B", "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#"];
var noteIndexToNote = ["C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"];
/**
* convert a note name to frequency (i.e. A4 to 440)
@ -423,7 +423,7 @@ define("Tone/core/Tone", [], function(){
var index = noteToIndex[parts[0].toLowerCase()];
var octave = parts[1];
var noteNumber = index + parseInt(octave, 10) * 12;
return Math.pow(2, (noteNumber - 48) / 12) * 440;
return Math.pow(2, (noteNumber - 48) / 12) * 523.251;
} else {
return 0;
}
@ -435,7 +435,7 @@ define("Tone/core/Tone", [], function(){
* @return {string}
*/
Tone.prototype.frequencyToNote = function(freq){
var log = Math.log(freq / 440) / Math.LN2;
var log = Math.log(freq / 523.251) / Math.LN2;
var noteNumber = Math.round(12 * log) + 48;
var octave = Math.floor(noteNumber/12);
var noteName = noteIndexToNote[noteNumber % 12];