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

will emit 'progress' when there is .lengthComputable is false

Browse source
This commit is contained in:
Yotam Mann 2016-09-19 00:16:44 -04:00
parent 53d7e8df60
commit 2f525e74b7
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Tone/core/Buffer.js
View file

@ -382,6 +382,15 @@ define(["Tone/core/Tone", "Tone/core/Emitter", "Tone/type/Type"], function(Tone)
}
};
function onProgress(){
//calculate the progress
var totalProgress = 0;
for (var i = 0; i < Tone.Buffer._downloadQueue.length; i++){
totalProgress += Tone.Buffer._downloadQueue[i].progress;
}
Tone.Buffer.emit("progress", totalProgress / Tone.Buffer._downloadQueue.length);
}
var request = new XMLHttpRequest();
request.open("GET", Tone.Buffer.baseUrl + url, true);
request.responseType = "arraybuffer";
@ -394,6 +403,7 @@ define(["Tone/core/Tone", "Tone/core/Emitter", "Tone/type/Type"], function(Tone)
Tone.context.decodeAudioData(request.response, function(buff) {
request.progress = 1;
onProgress();
onload(buff);
Tone.Buffer._currentDownloads--;
@ -417,13 +427,7 @@ define(["Tone/core/Tone", "Tone/core/Emitter", "Tone/type/Type"], function(Tone)
request.addEventListener("progress", function(event){
if (event.lengthComputable){
request.progress = event.loaded / event.total;
//calculate the progress
var totalProgress = 0;
for (var i = 0; i < Tone.Buffer._downloadQueue.length; i++){
totalProgress += Tone.Buffer._downloadQueue[i].progress;
}
Tone.Buffer.emit("progress", totalProgress / Tone.Buffer._downloadQueue.length);
onProgress();
}
});