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

sampler should throw error if there are no available notes to play

Browse source 
before failed silently
This commit is contained in:
tambien 2019-02-01 12:01:35 -05:00
parent cb156fc6a3
commit ddb9f8b4d8
1 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
Tone/instrument/Sampler.js
View file

@ -113,7 +113,7 @@ Tone.Sampler.prototype._findClosest = function(midi){
}
interval++;
}
return null;
throw new Error("No available buffers for note: "+midi);
};
/**
@ -131,35 +131,33 @@ Tone.Sampler.prototype.triggerAttack = function(notes, time, velocity){
var midi = Tone.Frequency(notes[i]).toMidi();
// find the closest note pitch
var difference = this._findClosest(midi);
if (difference !== null){
var closestNote = midi - difference;
var buffer = this._buffers.get(closestNote);
var playbackRate = Tone.intervalToFrequencyRatio(difference);
// play that note
var source = new Tone.BufferSource({
"buffer" : buffer,
"playbackRate" : playbackRate,
"fadeIn" : this.attack,
"fadeOut" : this.release,
"curve" : this.curve,
}).connect(this.output);
source.start(time, 0, buffer.duration / playbackRate, velocity);
// add it to the active sources
if (!Tone.isArray(this._activeSources[midi])){
this._activeSources[midi] = [];
}
this._activeSources[midi].push(source);
//remove it when it's done
source.onended = function(){
if (this._activeSources && this._activeSources[midi]){
var index = this._activeSources[midi].indexOf(source);
if (index !== -1){
this._activeSources[midi].splice(index, 1);
}
}
}.bind(this);
var closestNote = midi - difference;
var buffer = this._buffers.get(closestNote);
var playbackRate = Tone.intervalToFrequencyRatio(difference);
// play that note
var source = new Tone.BufferSource({
"buffer" : buffer,
"playbackRate" : playbackRate,
"fadeIn" : this.attack,
"fadeOut" : this.release,
"curve" : this.curve,
}).connect(this.output);
source.start(time, 0, buffer.duration / playbackRate, velocity);
// add it to the active sources
if (!Tone.isArray(this._activeSources[midi])){
this._activeSources[midi] = [];
}
this._activeSources[midi].push(source);
//remove it when it's done
source.onended = function(){
if (this._activeSources && this._activeSources[midi]){
var index = this._activeSources[midi].indexOf(source);
if (index !== -1){
this._activeSources[midi].splice(index, 1);
}
}
}.bind(this);
}
return this;
};
@ -226,8 +224,8 @@ Tone.Sampler.prototype.sync = function(){
/**
* Invoke the attack phase, then after the duration, invoke the release.
* @param {Frequency} note The note to play
* @param {Time} duration The time the note should be held
* @param {(Frequency|Frequency[])} note The note to play
* @param {(Time|Time[])} duration The time the note should be held
* @param {Time=} time When to start the attack
* @param {NormalRange} [velocity=1] The velocity of the attack
* @return {Tone.Sampler} this
@ -290,6 +288,7 @@ Tone.Sampler.prototype.dispose = function(){
this._buffers.dispose();
this._buffers = null;
for (var midi in this._activeSources){
console.log("here");
this._activeSources[midi].forEach(function(source){
source.dispose();
});