Refactor src/lib/libopenal.js. NFC

src/lib/libopenal.js

@@ -331,8 +331,8 @@ var LibraryOpenAL = {
     },
 
     stopSourceAudio: (src) => {
-      for (var i = 0; i < src.audioQueue.length; i++) {
-        src.audioQueue[i].stop();
+      for (var audioSrc of src.audioQueue) {
+        audioSrc.stop();
       }
       src.audioQueue.length = 0;
     },
@@ -399,9 +399,9 @@ var LibraryOpenAL = {
 
       // Find the first non-zero buffer in the queue to determine the proper format
       var templateBuf = AL.buffers[0];
-      for (var i = 0; i < src.bufQueue.length; i++) {
-        if (src.bufQueue[i].id !== 0) {
-          templateBuf = src.bufQueue[i];
+      for (var buf of src.bufQueue) {
+        if (buf.id !== 0) {
+          templateBuf = buf;
           break;
         }
       }
@@ -697,9 +697,8 @@ var LibraryOpenAL = {
 
     sourceDuration: (src) => {
       var length = 0.0;
-      for (var i = 0; i < src.bufQueue.length; i++) {
-        var audioBuf = src.bufQueue[i].audioBuf;
-        length += audioBuf ? audioBuf.duration : 0.0;
+      for (var buf of src.bufQueue) {
+        length += buf.audioBuf?.duration ?? 0.0;
       }
       return length;
     },
@@ -709,9 +708,7 @@ var LibraryOpenAL = {
 
       var offset = 0.0;
       for (var i = 0; i < src.bufsProcessed; i++) {
-        if (src.bufQueue[i].audioBuf) {
-          offset += src.bufQueue[i].audioBuf.duration;
-        }
+        offset += src.bufQueue[i].audioBuf?.duration ?? 0.0;
       }
       offset += src.bufOffset;
 
@@ -1131,17 +1128,17 @@ var LibraryOpenAL = {
       case 0x2009 /* AL_BYTE_LENGTH_SOFT */:
         var length = 0;
         var bytesPerFrame = 0;
-        for (var i = 0; i < src.bufQueue.length; i++) {
-          length += src.bufQueue[i].length;
-          if (src.bufQueue[i].id !== 0) {
-            bytesPerFrame = src.bufQueue[i].bytesPerSample * src.bufQueue[i].channels;
+        for (var buf of src.bufQueue) {
+          length += buf.length;
+          if (buf.id !== 0) {
+            bytesPerFrame = buf.bytesPerSample * buf.channels;
           }
         }
         return length * bytesPerFrame;
       case 0x200A /* AL_SAMPLE_LENGTH_SOFT */:
         var length = 0;
-        for (var i = 0; i < src.bufQueue.length; i++) {
-          length += src.bufQueue[i].length;
+        for (var buf of src.bufQueue) {
+          length += buf.length;
         }
         return length;
       case 0x200B /* AL_SEC_LENGTH_SOFT */:
@@ -1317,33 +1314,26 @@ var LibraryOpenAL = {
           return;
         }
 
-        if (value === 0) {
-          for (var i in src.bufQueue) {
-            src.bufQueue[i].refCount--;
-          }
-          src.bufQueue.length = 1;
-          src.bufQueue[0] = AL.buffers[0];
-
-          src.bufsProcessed = 0;
-          src.type = 0x1030 /* AL_UNDETERMINED */;
-        } else {
-          var buf = AL.buffers[value];
-          if (!buf) {
+        var buf = AL.buffers[value];
+        if (!buf) {
 #if OPENAL_DEBUG
-            dbg('alSourcei(AL_BUFFER) called with an invalid buffer');
+          dbg('alSourcei(AL_BUFFER) called with an invalid buffer');
 #endif
-            AL.currentCtx.err = {{{ cDefs.AL_INVALID_VALUE }}};
-            return;
-          }
+          AL.currentCtx.err = {{{ cDefs.AL_INVALID_VALUE }}};
+          return;
+        }
 
-          for (var i in src.bufQueue) {
-            src.bufQueue[i].refCount--;
-          }
-          src.bufQueue.length = 0;
+        for (var oldBuf of src.bufQueue) {
+          oldBuf.refCount--;
+        }
 
+        src.bufQueue = [buf];
+        src.bufsProcessed = 0;
+
+        if (value === 0) {
+          src.type = 0x1030 /* AL_UNDETERMINED */;
+        } else {
           buf.refCount++;
-          src.bufQueue = [buf];
-          src.bufsProcessed = 0;
           src.type = {{{ cDefs.AL_STATIC }}};
         }
 

test/codesize/test_codesize_hello_dylink_all.json

@@ -1,7 +1,7 @@
 {
-  "a.out.js": 268215,
+  "a.out.js": 268019,
   "a.out.nodebug.wasm": 588309,
-  "total": 856524,
+  "total": 856328,
   "sent": [
     "IMG_Init",
     "IMG_Load",

tools/maint/sync_deps.py

@@ -98,7 +98,7 @@ def sync_repo(name, repo_dir, revision, url):
     return
 
   if is_dirty(repo_dir):
-    utils.exit_with_error("Directory for {name} is dirty: '{repo_dir}'")
+    utils.exit_with_error(f"Directory for {name} is dirty: '{repo_dir}'")
 
   if not has_revision(repo_dir, revision):
     print('  Fetching revision')