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

fixed rounding error when converting frequency to midi

Browse source
This commit is contained in:
Yotam Mann 2017-08-26 15:36:06 -04:00
parent 5bea2666c0
commit 6937466554
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Tone/type/Frequency.js
View file

@ -1,9 +1,9 @@
define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) { define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
/** /**
* @class Tone.Frequency is a primitive type for encoding Frequency values. * @class Tone.Frequency is a primitive type for encoding Frequency values.
* Eventually all time values are evaluated to hertz * Eventually all time values are evaluated to hertz
* using the `eval` method. * using the `eval` method.
* @constructor * @constructor
* @extends {Tone.TimeBase} * @extends {Tone.TimeBase}
* @param {String|Number} val The time value. * @param {String|Number} val The time value.
@ -15,7 +15,7 @@ define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
*/ */
Tone.Frequency = function(val, units){ Tone.Frequency = function(val, units){
if (this instanceof Tone.Frequency){ if (this instanceof Tone.Frequency){
Tone.TimeBase.call(this, val, units); Tone.TimeBase.call(this, val, units);
} else { } else {
@ -29,7 +29,7 @@ define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
// AUGMENT BASE EXPRESSIONS // AUGMENT BASE EXPRESSIONS
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
//clone the expressions so that //clone the expressions so that
//we can add more without modifying the original //we can add more without modifying the original
Tone.Frequency.prototype._primaryExpressions = Object.create(Tone.TimeBase.prototype._primaryExpressions); Tone.Frequency.prototype._primaryExpressions = Object.create(Tone.TimeBase.prototype._primaryExpressions);
@ -42,7 +42,7 @@ define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
regexp : /^(\d+(?:\.\d+)?midi)/, regexp : /^(\d+(?:\.\d+)?midi)/,
method : function(value){ method : function(value){
return this.midiToFrequency(value); return this.midiToFrequency(value);
} }
}; };
/* /*
@ -56,7 +56,7 @@ define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
var index = noteToScaleIndex[pitch.toLowerCase()]; var index = noteToScaleIndex[pitch.toLowerCase()];
var noteNumber = index + (parseInt(octave) + 1) * 12; var noteNumber = index + (parseInt(octave) + 1) * 12;
return this.midiToFrequency(noteNumber); return this.midiToFrequency(noteNumber);
} }
}; };
/* /*
@ -237,9 +237,9 @@ define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
* @type {Object} * @type {Object}
*/ */
var noteToScaleIndex = { var noteToScaleIndex = {
"cbb" : -2, "cb" : -1, "c" : 0, "c#" : 1, "cx" : 2, "cbb" : -2, "cb" : -1, "c" : 0, "c#" : 1, "cx" : 2,
"dbb" : 0, "db" : 1, "d" : 2, "d#" : 3, "dx" : 4, "dbb" : 0, "db" : 1, "d" : 2, "d#" : 3, "dx" : 4,
"ebb" : 2, "eb" : 3, "e" : 4, "e#" : 5, "ex" : 6, "ebb" : 2, "eb" : 3, "e" : 4, "e#" : 5, "ex" : 6,
"fbb" : 3, "fb" : 4, "f" : 5, "f#" : 6, "fx" : 7, "fbb" : 3, "fb" : 4, "f" : 5, "f#" : 6, "fx" : 7,
"gbb" : 5, "gb" : 6, "g" : 7, "g#" : 8, "gx" : 9, "gbb" : 5, "gb" : 6, "g" : 7, "g#" : 8, "gx" : 9,
"abb" : 7, "ab" : 8, "a" : 9, "a#" : 10, "ax" : 11, "abb" : 7, "ab" : 8, "a" : 9, "a#" : 10, "ax" : 11,
@ -254,14 +254,14 @@ define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
/** /**
* The [concert pitch](https://en.wikipedia.org/wiki/Concert_pitch) * The [concert pitch](https://en.wikipedia.org/wiki/Concert_pitch)
* A4's values in Hertz. * A4's values in Hertz.
* @type {Frequency} * @type {Frequency}
* @static * @static
*/ */
Tone.Frequency.A4 = 440; Tone.Frequency.A4 = 440;
/** /**
* Convert a MIDI note to frequency value. * Convert a MIDI note to frequency value.
* @param {MIDI} midi The midi number to convert. * @param {MIDI} midi The midi number to convert.
* @return {Frequency} the corresponding frequency value * @return {Frequency} the corresponding frequency value
* @example * @example
@ -279,8 +279,8 @@ define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
* tone.midiToFrequency(440); // returns 69 * tone.midiToFrequency(440); // returns 69
*/ */
Tone.Frequency.prototype.frequencyToMidi = function(frequency){ Tone.Frequency.prototype.frequencyToMidi = function(frequency){
return 69 + 12 * Math.log(frequency / Tone.Frequency.A4) / Math.LN2; return 69 + Math.round(12 * Math.log(frequency / Tone.Frequency.A4) / Math.LN2);
}; };
return Tone.Frequency; return Tone.Frequency;
}); });