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

.load method returns a Promise

Browse source
This commit is contained in:
Yotam Mann 2016-11-06 19:16:31 -05:00
parent 45eba82840
commit 3ca0eadafd
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Tone/source/Player.js
View file

@ -129,11 +129,10 @@ define(["Tone/core/Tone", "Tone/core/Buffer", "Tone/source/Source"], function(To
* browser. * browser.
* @param {function=} callback The function to invoke once * @param {function=} callback The function to invoke once
* the sample is loaded. * the sample is loaded.
* @returns {Tone.Player} this * @returns {Promise}
*/ */
Tone.Player.prototype.load = function(url, callback){ Tone.Player.prototype.load = function(url, callback){
this._buffer.load(url, this._onload.bind(this, callback)); return this._buffer.load(url, this._onload.bind(this, callback));
return this;
}; };
/** /**
@ -141,6 +140,7 @@ define(["Tone/core/Tone", "Tone/core/Buffer", "Tone/source/Source"], function(To
* @private * @private
*/ */
Tone.Player.prototype._onload = function(callback){ Tone.Player.prototype._onload = function(callback){
callback = this.defaultArg(callback, Tone.noOp);
callback(this); callback(this);
if (this.autostart){ if (this.autostart){
this.start(); this.start();

9
test/source/Player.js
View file

@ -54,6 +54,15 @@ define(["helper/Basic", "Tone/source/Player", "helper/Offline",
}); });
}); });
it("returns a promise", function(done){
var player = new Player();
var promise = player.load("./audio/sine.wav");
expect(promise).to.be.instanceof(Promise);
promise.then(function(){
done();
});
});
it("can be created with an options object", function(){ it("can be created with an options object", function(){
var player = new Player({ var player = new Player({
"url" : "./audio/sine.wav", "url" : "./audio/sine.wav",