Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/components/meme-selector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ function VideoMemeItem(props: VideoMemeItemProps): JSX.Element {
const video = Meme.video(props.name);
if (!video) throw new Error(`Video meme not found: ${props.name}`);

video.element.volume = Settings.audio.volume.peek();
// Media elements cap volume at unity; amplification belongs to the room gain node.
video.element.volume = Math.min(Settings.audio.volume.peek(), 1);
video.element.muted = false;
video.element.style.width = "100%";
video.element.style.height = "100%";
Expand Down
19 changes: 5 additions & 14 deletions app/src/controls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import type { HangLocalSource } from "./room/local";
import { Local } from "./room/local";
import { Sound } from "./room/sound";
import Settings, { Modal } from "./settings";
import * as Speaker from "./speaker";
import * as Tauri from "./tauri";
import { isMobile } from "./util/mobile";

Expand Down Expand Up @@ -860,16 +861,6 @@ function Volume(): JSX.Element {
const volume = solid(Settings.audio.volume);
const opacity = Opacity(() => showSlider());

const setVolume = (v: number) => {
if (v === 0) {
Settings.audio.enabled.set(false);
Settings.audio.volume.set(1.0);
} else {
Settings.audio.enabled.set(true);
Settings.audio.volume.set(v);
}
};

return (
<Tooltip content={enabled() ? "Disable audio" : "Enable audio"} position="top">
<fieldset
Expand All @@ -894,11 +885,11 @@ function Volume(): JSX.Element {
<Show when={opacity() > 0}>
<input
type="range"
min="0"
step="0.01"
max="2"
min={Speaker.VOLUME_RANGE.min}
step={Speaker.VOLUME_RANGE.step}
max={Speaker.VOLUME_RANGE.max}
value={enabled() ? volume() : 0}
onInput={(e) => setVolume(Number(e.currentTarget.value))}
onInput={(e) => Settings.audio.setVolume(Number(e.currentTarget.value))}
class="cursor-pointer backdrop-blur-sm bg-transparent rounded py-1 px-2 outline-none"
aria-label="Output Volume"
style={{
Expand Down
4 changes: 3 additions & 1 deletion app/src/room/audio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ export class Audio {
const root = effect.get(this.broadcast.source.audio.root);
if (!root) return;

const gain = new GainNode(root.context, { gain: Settings.audio.volume.peek() });
const gain = new GainNode(root.context, {
gain: Settings.audio.enabled.peek() ? Settings.audio.volume.peek() : 0,
});
effect.cleanup(() => gain.disconnect());

this.#gain.set(gain);
Expand Down
20 changes: 3 additions & 17 deletions app/src/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type { JSX } from "solid-js/jsx-runtime";
import { z } from "zod";
import { Tab } from "./components/meme-selector";
import { Sound } from "./room/sound";
import * as Speaker from "./speaker";

const ttsSchema = z.enum(["none", "low", "high"]);
type TTS = z.infer<typeof ttsSchema>;
Expand All @@ -25,13 +26,13 @@ function loadTTS() {
}

const guest = Api.guestSchema.safeParse(localStorage.getItem("settings.account.guest"));
const effect = new Effect();

export const Settings = {
draggable: new Signal(localStorage.getItem("settings.draggable") !== "false"),

audio: {
enabled: new Signal(localStorage.getItem("settings.audio.enabled") !== "false"),
volume: new Signal<number>(Number.parseFloat(localStorage.getItem("settings.audio.volume") ?? "1")),
...Speaker.load(localStorage, effect),
tts: new Signal<TTS>(loadTTS()),
},

Expand Down Expand Up @@ -101,25 +102,10 @@ export const Settings = {
},
};

const volume = Settings.audio.volume.peek();
if (Number.isNaN(volume) || volume < 0 || volume > 1) {
Settings.audio.volume.set(1);
}

const effect = new Effect();

effect.subscribe(Settings.draggable, (draggable) => {
localStorage.setItem("settings.draggable", draggable.toString());
});

effect.subscribe(Settings.audio.volume, (volume) => {
localStorage.setItem("settings.audio.volume", volume.toString());
});

effect.subscribe(Settings.audio.enabled, (enabled) => {
localStorage.setItem("settings.audio.enabled", enabled.toString());
});

effect.subscribe(Settings.microphone.gain, (gain) => {
localStorage.setItem("settings.microphone.gain", gain.toString());
});
Expand Down
88 changes: 88 additions & 0 deletions app/src/speaker.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import { afterEach, expect, test } from "bun:test";
import * as Signals from "@moq/signals";
import * as Speaker from "./speaker";

class Storage {
#values = new Map<string, string>();

getItem(key: string): string | null {
return this.#values.get(key) ?? null;
}

setItem(key: string, value: string) {
this.#values.set(key, value);
}
}

const effects: Signals.Effect[] = [];

function load(storage: Storage) {
const effect = new Signals.Effect();
effects.push(effect);
return Speaker.load(storage, effect);
}

afterEach(() => {
for (const effect of effects.splice(0)) effect.close();
});

test.each([0.01, 0.75, 1.5, Speaker.VOLUME_RANGE.max])("selected gain %s survives reload", async (gain) => {
const storage = new Storage();
const audio = load(storage);
audio.setVolume(gain);
await Promise.resolve();
expect(storage.getItem("settings.audio.volume")).toBe(gain.toString());
const reloaded = load(storage);
expect(reloaded.volume.peek()).toBe(gain);
expect(reloaded.enabled.peek()).toBe(true);
});

test.each(["NaN", "Infinity", "-Infinity", "-0.01", "2.01", "1.5junk", "", " "])(
"invalid persisted gain '%s' resets to unity",
async (raw) => {
const storage = new Storage();
storage.setItem("settings.audio.volume", raw);
const audio = load(storage);
expect(audio.volume.peek()).toBe(1);
expect(audio.enabled.peek()).toBe(true);
await Promise.resolve();
expect(storage.getItem("settings.audio.volume")).toBe("1");
},
);

test.each(["button", "slider"])("%s mute preserves gain across reload and unmute", async (mute) => {
const storage = new Storage();
const audio = load(storage);
audio.setVolume(1.7);
if (mute === "slider") audio.setVolume(0);
else audio.enabled.update((enabled) => !enabled);
await Promise.resolve();
expect(storage.getItem("settings.audio.volume")).toBe("1.7");
expect(storage.getItem("settings.audio.enabled")).toBe("false");
const reloaded = load(storage);
expect(reloaded.enabled.peek()).toBe(false);
reloaded.enabled.update((enabled) => !enabled);
expect(reloaded.enabled.peek()).toBe(true);
expect(reloaded.volume.peek()).toBe(1.7);
});

test("a nonzero slider change unmutes and persists the new gain", async () => {
const storage = new Storage();
const audio = load(storage);
audio.setVolume(1.7);
audio.setVolume(0);
audio.setVolume(0.5);
await Promise.resolve();
const reloaded = load(storage);
expect(reloaded.volume.peek()).toBe(0.5);
expect(reloaded.enabled.peek()).toBe(true);
});

test("a legacy zero gain stays muted and can be unmuted audibly", () => {
const storage = new Storage();
storage.setItem("settings.audio.volume", "0");
const audio = load(storage);
expect(audio.enabled.peek()).toBe(false);
audio.enabled.update((enabled) => !enabled);
expect(audio.volume.peek()).toBe(1);
});
41 changes: 41 additions & 0 deletions app/src/speaker.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import * as Signals from "@moq/signals";

/** The speaker slider and stored gain share this range. */
export const VOLUME_RANGE = { min: 0, max: 2, step: 0.01 };

function validVolume(value: number): boolean {
return Number.isFinite(value) && value >= VOLUME_RANGE.min && value <= VOLUME_RANGE.max;
}

/** Load speaker gain and mute, persisting changes until the effect closes. */
export function load(
storage: Pick<Storage, "getItem" | "setItem">,
effect: Signals.Effect,
): { enabled: Signals.Signal<boolean>; volume: Signals.Signal<number>; setVolume(value: number): void } {
const raw = storage.getItem("settings.audio.volume");
let initial = raw?.trim() ? Number(raw) : 1;
if (!validVolume(initial)) initial = 1;

// Zero represents mute; keep an audible gain for the next unmute.
const enabled = new Signals.Signal(
storage.getItem("settings.audio.enabled") !== "false" && initial !== VOLUME_RANGE.min,
);
const volume = new Signals.Signal(initial === VOLUME_RANGE.min ? 1 : initial);

effect.subscribe(volume, (value) => storage.setItem("settings.audio.volume", value.toString()));
effect.subscribe(enabled, (value) => storage.setItem("settings.audio.enabled", value.toString()));

return {
enabled,
volume,
setVolume(value: number): void {
if (!validVolume(value)) return;
if (value === VOLUME_RANGE.min) {
enabled.set(false);
} else {
volume.set(value);
enabled.set(true);
}
},
};
}
1 change: 0 additions & 1 deletion quest/m0/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ verified presence and volume bugs. Each child is independently shippable.
## Required

- [Recover media toggles](/quest/m0/media-toggles.md) - audio and video resume without reloading
- [Preserve speaker gain](/quest/m0/speaker-volume.md) - supported volume survives reload and mute cycles
21 changes: 0 additions & 21 deletions quest/m0/speaker-volume.md

This file was deleted.