Merge pull request #2225 from juj/safari_webaudio

Safari 6.0.5 webaudio fixes in SDL and OpenAL library.

3 files changed, 31 insertions, 11 deletions

diff --git a/src/library_openal.js b/src/library_openal.js
index fd382aa1..58b11607 100644
--- a/src/library_openal.js
+++ b/src/library_openal.js
@@ -58,9 +58,21 @@ var LibraryOpenAL = {
           entry.src = AL.currentContext.ctx.createBufferSource();
           entry.src.buffer = entry.buffer;
           entry.src.connect(src.gain);
-          entry.src.start(startTime, offset);
-          
+          if (typeof(entry.src.start) !== 'undefined') {
+            entry.src.start(startTime, offset);
+          } else if (typeof(entry.src.noteOn) !== 'undefined') {
+            entry.src.noteOn(startTime);
 #if OPENAL_DEBUG
+            if (offset > 0) {
+              Runtime.warnOnce('The current browser does not support AudioBufferSourceNode.start(when, offset); method, so cannot play back audio with an offset '+offset+' secs! Audio glitches will occur!');
+            }
+#endif
+          }
+#if OPENAL_DEBUG
+          else {
+            Runtime.warnOnce('Unable to start AudioBufferSourceNode playback! Not supported by the browser?');
+          }
+
           console.log('updateSource queuing buffer ' + i + ' for source ' + idx + ' at ' + startTime + ' (offset by ' + offset + ')');
 #endif
         }
@@ -204,6 +216,9 @@ var LibraryOpenAL = {
     }
 
     if (ctx) {
+      // Old Web Audio API (e.g. Safari 6.0.5) had an inconsistently named createGainNode function.
+      if (typeof(ctx.createGain) === 'undefined') ctx.createGain = ctx.createGainNode;
+
       var gain = ctx.createGain();
       gain.connect(ctx.destination);
       var context = {
@@ -1283,16 +1298,16 @@ var LibraryOpenAL = {
       ret = 'Out of Memory';
       break;
     case 0x1004 /* ALC_DEFAULT_DEVICE_SPECIFIER */:
-      if (typeof(AudioContext) == "function" ||
-          typeof(webkitAudioContext) == "function") {
+      if (typeof(AudioContext) !== "undefined" ||
+          typeof(webkitAudioContext) !== "undefined") {
         ret = 'Device';
       } else {
         return 0;
       }
       break;
     case 0x1005 /* ALC_DEVICE_SPECIFIER */:
-      if (typeof(AudioContext) == "function" ||
-          typeof(webkitAudioContext) == "function") {
+      if (typeof(AudioContext) !== "undefined" ||
+          typeof(webkitAudioContext) !== "undefined") {
         ret = 'Device\0';
       } else {
         ret = '\0';
diff --git a/src/library_sdl.js b/src/library_sdl.js
index b50073be..364349b6 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -1746,9 +1746,9 @@ var LibrarySDL = {
         // Initialize Web Audio API if we haven't done so yet. Note: Only initialize Web Audio context ever once on the web page,
         // since initializing multiple times fails on Chrome saying 'audio resources have been exhausted'.
         if (!SDL.audioContext) {
-          if (typeof(AudioContext) === 'function') {
+          if (typeof(AudioContext) !== 'undefined') {
             SDL.audioContext = new AudioContext();
-          } else if (typeof(webkitAudioContext) === 'function') {
+          } else if (typeof(webkitAudioContext) !== 'undefined') {
             SDL.audioContext = new webkitAudioContext();
           } else {
             throw 'Web Audio API is not available!';
@@ -1791,7 +1791,12 @@ var LibrarySDL = {
             }
 #endif
             var playtime = Math.max(curtime, SDL.audio.nextPlayTime);
-            SDL.audio.soundSource[SDL.audio.nextSoundSource]['start'](playtime);
+            var ss = SDL.audio.soundSource[SDL.audio.nextSoundSource];
+            if (typeof ss['start'] !== 'undefined') {
+              ss['start'](playtime);
+            } else if (typeof ss['noteOn'] !== 'undefined') {
+              ss['noteOn'](playtime);
+            }
             var buffer_duration = sizeSamplesPerChannel / SDL.audio.freq;
             SDL.audio.nextPlayTime = playtime + buffer_duration;
             // Timer will be scheduled before the buffer completed playing.
@@ -1864,7 +1869,7 @@ var LibrarySDL = {
     } else if (!SDL.audio.timer && !SDL.audio.scriptProcessorNode) {
       // If we are using the same sampling frequency as the native sampling rate of the Web Audio graph is using, we can feed our buffers via
       // Web Audio ScriptProcessorNode, which is a pull-mode API that calls back to our code to get audio data.
-      if (SDL.audioContext !== undefined && SDL.audio.freq == SDL.audioContext['sampleRate']) {
+      if (SDL.audioContext !== undefined && SDL.audio.freq == SDL.audioContext['sampleRate'] && typeof SDL.audioContext['createScriptProcessor'] !== 'undefined') {
         var sizeSamplesPerChannel = SDL.audio.bufferSize / SDL.audio.bytesPerSample / SDL.audio.channels; // How many samples per a single channel fit in the cb buffer?
         SDL.audio.scriptProcessorNode = SDL.audioContext['createScriptProcessor'](sizeSamplesPerChannel, 0, SDL.audio.channels);
         SDL.audio.scriptProcessorNode['onaudioprocess'] = function (e) {
diff --git a/tests/openal_playback.cpp b/tests/openal_playback.cpp
index 880b6906..46c4f8a3 100644
--- a/tests/openal_playback.cpp
+++ b/tests/openal_playback.cpp
@@ -25,7 +25,7 @@ void playSource(void* arg)
   alGetSourcei(source, AL_SOURCE_STATE, &state);
   assert(state == AL_STOPPED);
 
-#ifdef __EMSCRIPTEN__
+#ifdef REPORT_RESULT
   int result = 1;
   REPORT_RESULT();
 #endif