Skip to content

Fix/loadbuffer status error and progress count #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix/loadbuffer status error and progress count #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e63103
Update inProgressCount prior to onError callback in loadBuffer
Jun 30, 2016
ca52cfe
Check for http status code errors or FileReader errors in loadBuffer
Jun 30, 2016
2cf2738
Remove extraneous condition from error check. Refresh build.
Jun 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions build/webaudiox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ var WebAudiox = WebAudiox || {}

/**
* Helper to load a buffer
*
*
* @param {AudioContext} context the WebAudio API context
* @param {String} url the url of the sound to load
* @param {Function} onLoad callback to notify when the buffer is loaded and decoded
Expand All @@ -336,19 +336,27 @@ WebAudiox.loadBuffer = function(context, url, onLoad, onError){
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount++
request.onload = function(){
context.decodeAudioData(request.response, function(buffer){
// Check XMLHttpRequest.status or FileReader.error parameter
if( request.status < 400 || (!request.status && !request.error) ){
context.decodeAudioData(request.response, function(buffer){
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount--
// notify the callback
onLoad(buffer)
// notify
WebAudiox.loadBuffer.onLoad(context, url, buffer)
}, function(){
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount--
// notify the callback
onError()
})
} else {
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount--
// notify the callback
onLoad(buffer)
// notify
WebAudiox.loadBuffer.onLoad(context, url, buffer)
}, function(){
// notify the callback
onError()
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount--
})
}
}
request.send()
}
Expand Down
28 changes: 18 additions & 10 deletions lib/webaudiox.loadbuffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var WebAudiox = WebAudiox || {}

/**
* Helper to load a buffer
*
*
* @param {AudioContext} context the WebAudio API context
* @param {String} url the url of the sound to load
* @param {Function} onLoad callback to notify when the buffer is loaded and decoded
Expand All @@ -21,19 +21,27 @@ WebAudiox.loadBuffer = function(context, url, onLoad, onError){
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount++
request.onload = function(){
context.decodeAudioData(request.response, function(buffer){
// Check XMLHttpRequest.status or FileReader.error parameter
if( request.status < 400 || (!request.status && !request.error) ){
context.decodeAudioData(request.response, function(buffer){
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount--
// notify the callback
onLoad(buffer)
// notify
WebAudiox.loadBuffer.onLoad(context, url, buffer)
}, function(){
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount--
// notify the callback
onError()
})
} else {
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount--
// notify the callback
onLoad(buffer)
// notify
WebAudiox.loadBuffer.onLoad(context, url, buffer)
}, function(){
// notify the callback
onError()
// counter inProgress request
WebAudiox.loadBuffer.inProgressCount--
})
}
}
request.send()
}
Expand Down