Merge pull request #1587 from inolen/openal_buffers_revert

revert pr #1493

1 files changed, 5 insertions, 12 deletions

diff --git a/src/library_openal.js b/src/library_openal.js
index dea986f3..e8a2e223 100644
--- a/src/library_openal.js
+++ b/src/library_openal.js
@@ -8,12 +8,6 @@ var LibraryOpenAL = {
     QUEUE_INTERVAL: 25,
     QUEUE_LOOKAHEAD: 100,
 
-    getCurrentTime: function(context) {
-      // currentTime is frozen during execution, use performance timers to
-      // emulate the current time at call time
-      return (window['performance']['now']() - context.startTime) / 1000.0;
-    },
-
     updateSources: function(context) {
       for (var i = 0; i < context.src.length; i++) {
         AL.updateSource(context.src[i]);
@@ -28,7 +22,7 @@ var LibraryOpenAL = {
         return;
       }
 
-      var currentTime = AL.getCurrentTime(AL.currentContext);
+      var currentTime = AL.currentContext.ctx.currentTime;
       var startTime = src.bufferPosition;
 
       for (var i = src.buffersPlayed; i < src.queue.length; i++) {
@@ -79,7 +73,7 @@ var LibraryOpenAL = {
         if (src.state !== 0x1013 /* AL_PAUSED */) {
           src.state = 0x1012 /* AL_PLAYING */;
           // Reset our position.
-          src.bufferPosition = AL.getCurrentTime(AL.currentContext);
+          src.bufferPosition = AL.currentContext.ctx.currentTime;
           src.buffersPlayed = 0;
 #if OPENAL_DEBUG
           console.log('setSourceState resetting and playing source ' + idx);
@@ -87,7 +81,7 @@ var LibraryOpenAL = {
         } else {
           src.state = 0x1012 /* AL_PLAYING */;
           // Use the current offset from src.bufferPosition to resume at the correct point.
-          src.bufferPosition = AL.getCurrentTime(AL.currentContext) - src.bufferPosition;
+          src.bufferPosition = AL.currentContext.ctx.currentTime - src.bufferPosition;
 #if OPENAL_DEBUG
           console.log('setSourceState resuming source ' + idx + ' at ' + src.bufferPosition.toFixed(4));
 #endif
@@ -98,7 +92,7 @@ var LibraryOpenAL = {
         if (src.state === 0x1012 /* AL_PLAYING */) {
           src.state = 0x1013 /* AL_PAUSED */;
           // Store off the current offset to restore with on resume.
-          src.bufferPosition = AL.getCurrentTime(AL.currentContext) - src.bufferPosition;
+          src.bufferPosition = AL.currentContext.ctx.currentTime - src.bufferPosition;
           AL.stopSourceQueue(src);
 #if OPENAL_DEBUG
           console.log('setSourceState pausing source ' + idx + ' at ' + src.bufferPosition.toFixed(4));
@@ -212,8 +206,7 @@ var LibraryOpenAL = {
         err: 0,
         src: [],
         buf: [],
-        interval: setInterval(function() { AL.updateSources(context); }, AL.QUEUE_INTERVAL),
-        startTime: window['performance']['now']()
+        interval: setInterval(function() { AL.updateSources(context); }, AL.QUEUE_INTERVAL)
       };
       AL.contexts.push(context);
       return AL.contexts.length;