volume control

Author: caiiiycuk

package.json

@@ -1,6 +1,6 @@
 {
     "name": "emulators-ui",
-    "version": "0.73.4",
+    "version": "0.73.5",
     "description": "Emulators UI",
     "main": "dist/emulators-ui.js",
     "types": "dist/types/emulators-ui.d.ts",

src/build.ts

@@ -5,6 +5,6 @@
 
 export const Build = {
     short: "0.73.4",
-    version: "0.73.4 (187fc112dd3c66ac30885526e9cdd0cb)",
-    buildSeed: 1654072258715,
+    version: "0.73.4 (6a0cb8b5df676c0070a37160bcdc0521)",
+    buildSeed: 1654074868008,
 };

src/js-dos.ts

@@ -51,6 +51,8 @@ export class DosInstance {
     private onScaleChanged: ((scale: number) => void)[] = [];
     private onVolumeChanged: ((scale: number) => void)[] = [];
 
+    setVolumeImplFn: (volume: number) => void = () => {};
+
     constructor(root: HTMLDivElement, emulatorsUi: EmulatorsUi, options: DosOptions) {
         this.options = options;
         this.emulatorsUi = emulatorsUi;
@@ -117,7 +119,8 @@ export class DosInstance {
                 console.error("Unable to create webgl canvas, fallback to 2d rendering");
                 emulatorsUi.graphics._2d(this.layers, ci);
             }
-            emulatorsUi.sound.audioNode(ci);
+            this.setVolumeImplFn = emulatorsUi.sound.audioNode(ci);
+            this.setVolumeImplFn(this.volume);
         }
 
         emulatorsUi.dom.lifecycle(ci);
@@ -248,6 +251,8 @@ export class DosInstance {
 
     public async setVolume(volume: number) {
         this.volume = volume;
+        this.storage.setItem("volume", volume + "");
+        this.setVolumeImplFn(volume);
         for (const next of this.onVolumeChanged) {
             next(this.volume);
         }

src/sound/audio-node.ts

@@ -41,13 +41,13 @@ class SamplesQueue {
     }
 }
 
-export function audioNode(ci: CommandInterface) {
+export function audioNode(ci: CommandInterface): (volume: number) => void {
     const sampleRate = ci.soundFrequency();
     const channels = 1;
 
     if (sampleRate === 0) {
         console.warn("Can't create audio node with sampleRate === 0, ingnoring");
-        return;
+        return () => {};
     }
 
     let audioContext: AudioContext | null = null;
@@ -66,7 +66,7 @@ export function audioNode(ci: CommandInterface) {
     }
 
     if (audioContext == null) {
-        return;
+        return () => {};
     }
 
     const samplesQueue = new SamplesQueue();
@@ -148,7 +148,12 @@ export function audioNode(ci: CommandInterface) {
     };
 
     audioNode.onaudioprocess = ci.directSound !== undefined ? onDirectProcess : onQueueProcess;
-    audioNode.connect(audioContext.destination);
+
+    const gainNode = audioContext.createGain();
+    gainNode.connect(audioContext.destination);
+    audioNode.connect(gainNode);
+
+    gainNode.gain.value = 1.0;
 
     const resumeWebAudio = () => {
         if (audioContext !== null && audioContext.state === "suspended") {
@@ -163,11 +168,16 @@ export function audioNode(ci: CommandInterface) {
     ci.events().onExit(() => {
         if (audioContext !== null) {
             audioNode.disconnect();
+            gainNode.disconnect();
             audioContext.close();
         }
 
         document.removeEventListener("click", resumeWebAudio);
         document.removeEventListener("touchstart", resumeWebAudio);
         document.removeEventListener("keydown", resumeWebAudio);
     });
+
+    return (volume: number) => {
+        gainNode.gain.value = volume;
+    };
 }