web: Put audioSession specification in more appropriate location

ruffle-rs · Dec 1, 2024 · 16ba548 · 16ba548
1 parent 718e1e0
commit 16ba548
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 49 deletions.
diff --git a/web/packages/core/src/internal/player/inner.tsx b/web/packages/core/src/internal/player/inner.tsx
@@ -51,6 +51,9 @@ declare global {
          */
         webkitRequestFullScreen?: (options: unknown) => unknown;
     }
+    interface AudioSession {
+        type?: string;
+    }
 }
 
 /**
@@ -1629,49 +1632,54 @@ export class InnerPlayer {
             isAudioContextUnmuted = true;
             return;
         }
+        if ("audioSession" in navigator) {
+            // On browsers which support it (Safari 16.4+), we can specify https://www.w3.org/TR/audio-session/#audio-session-types
+            (navigator.audioSession as AudioSession).type = "playback";
+        } else {
+            // This is a workaround for iOS versions without audioSession support
+            this.container.addEventListener(
+                "click",
+                () => {
+                    if (isAudioContextUnmuted) {
+                        return;
+                    }
 
-        this.container.addEventListener(
-            "click",
-            () => {
-                if (isAudioContextUnmuted) {
-                    return;
-                }
-
-                const audioContext = this.instance?.audio_context();
-                if (!audioContext) {
-                    return;
-                }
+                    const audioContext = this.instance?.audio_context();
+                    if (!audioContext) {
+                        return;
+                    }
 
-                const audio = new Audio();
-                audio.src = (() => {
-                    // Returns a seven samples long 8 bit mono WAVE file.
-                    // This is required to prevent the AudioContext from desyncing and crashing.
-                    const arrayBuffer = new ArrayBuffer(10);
-                    const dataView = new DataView(arrayBuffer);
-                    const sampleRate = audioContext.sampleRate;
-                    dataView.setUint32(0, sampleRate, true);
-                    dataView.setUint32(4, sampleRate, true);
-                    dataView.setUint16(8, 1, true);
-                    const missingCharacters = window
-                        .btoa(
-                            String.fromCharCode(...new Uint8Array(arrayBuffer)),
-                        )
-                        .slice(0, 13);
-                    return `data:audio/wav;base64,UklGRisAAABXQVZFZm10IBAAAAABAAEA${missingCharacters}AgAZGF0YQcAAACAgICAgICAAAA=`;
-                })();
-
-                audio.load();
-                audio
-                    .play()
-                    .then(() => {
-                        isAudioContextUnmuted = true;
-                    })
-                    .catch((err) => {
-                        console.warn(`Failed to play dummy sound: ${err}`);
-                    });
-            },
-            { once: true },
-        );
+                    const audio = new Audio();
+                    audio.src = (() => {
+                        // Returns a seven samples long 8 bit mono WAVE file.
+                        // This is required to prevent the AudioContext from desyncing and crashing.
+                        const arrayBuffer = new ArrayBuffer(10);
+                        const dataView = new DataView(arrayBuffer);
+                        const sampleRate = audioContext.sampleRate;
+                        dataView.setUint32(0, sampleRate, true);
+                        dataView.setUint32(4, sampleRate, true);
+                        dataView.setUint16(8, 1, true);
+                        const missingCharacters = window
+                            .btoa(
+                                String.fromCharCode(...new Uint8Array(arrayBuffer)),
+                            )
+                            .slice(0, 13);
+                        return `data:audio/wav;base64,UklGRisAAABXQVZFZm10IBAAAAABAAEA${missingCharacters}AgAZGF0YQcAAACAgICAgICAAAA=`;
+                    })();
+
+                    audio.load();
+                    audio
+                        .play()
+                        .then(() => {
+                            isAudioContextUnmuted = true;
+                        })
+                        .catch((err) => {
+                            console.warn(`Failed to play dummy sound: ${err}`);
+                        });
+                },
+                { once: true },
+            );
+        }
     }
 
     /**

diff --git a/web/packages/core/src/plugin-polyfill.ts b/web/packages/core/src/plugin-polyfill.ts
@@ -231,9 +231,6 @@ declare global {
     interface MimeTypeArray {
         install?: (mimeType: MimeType) => void;
     }
-    interface AudioSession {
-        type?: string;
-    }
 }
 
 /**
@@ -247,11 +244,6 @@ declare global {
  * @param plugin The plugin to install
  */
 export function installPlugin(plugin: RufflePlugin): void {
-    // This code is not polyfill related, but while messing with the navigator API,
-    // we can specify https://www.w3.org/TR/audio-session/#audio-session-types
-    if ("audioSession" in navigator) {
-        (navigator.audioSession as AudioSession).type = "playback";
-    }
     if (navigator.plugins.namedItem("Shockwave Flash")) {
         return;
     }