encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Emscripten: Fixed throwing JavaScript exception if no audio context available. 

Handling the error in C provides the possibility to just continue without audio.
This commit is contained in:
Philipp Wiesemann 2015-02-14 00:16:27 +01:00
parent c5179c6acf
commit 6abd242b93
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/audio/emscripten/SDL_emscriptenaudio.c
View File

@ -157,6 +157,7 @@ Emscripten_OpenDevice(_THIS, const char *devname, int iscapture)
SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format); SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format);
int i; int i;
float f; float f;
int result;
while ((!valid_format) && (test_format)) { while ((!valid_format) && (test_format)) {
switch (test_format) { switch (test_format) {
@ -185,7 +186,7 @@ Emscripten_OpenDevice(_THIS, const char *devname, int iscapture)
/* based on parts of library_sdl.js */ /* based on parts of library_sdl.js */
/* create context (TODO: this puts stuff in the global namespace...)*/ /* create context (TODO: this puts stuff in the global namespace...)*/
EM_ASM({ result = EM_ASM_INT_V({
if(typeof(SDL2) === 'undefined') if(typeof(SDL2) === 'undefined')
SDL2 = {}; SDL2 = {};
@ -198,10 +199,14 @@ Emscripten_OpenDevice(_THIS, const char *devname, int iscapture)
} else if (typeof(webkitAudioContext) !== 'undefined') { } else if (typeof(webkitAudioContext) !== 'undefined') {
SDL2.audioContext = new webkitAudioContext(); SDL2.audioContext = new webkitAudioContext();
} else { } else {
throw 'Web Audio API is not available!'; return -1;
} }
} }
return 0;
}); });
if (result < 0) {
return SDL_SetError("Web Audio API is not available!");
}
/* limit to native freq */ /* limit to native freq */
int sampleRate = EM_ASM_INT_V({ int sampleRate = EM_ASM_INT_V({