fix(timer): sound loop and stop

hearchco · Jul 17, 2024 · 177202d · 177202d
1 parent 22a53b0
commit 177202d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 52 deletions.
diff --git a/src/lib/components/gadgets/timer/beeper.svelte b/src/lib/components/gadgets/timer/beeper.svelte
@@ -1,14 +1,21 @@
 <script>
 	import { sleep } from '$lib/functions/sleep/sleep';
+	import { onMount } from 'svelte';
 
 	/**
 	 * @typedef {object} Props
 	 * @property {boolean} beeping
-	 * @property {number|undefined} beepingInterval
 	 */
 
 	/** @type {Props} */
-	let { beeping, beepingInterval = $bindable() } = $props();
+	let { beeping } = $props();
+
+	/** @type {AudioContext|null} */
+	let ctx = $state(null);
+
+	onMount(() => {
+		ctx = new window.AudioContext();
+	});
 
 	/**
 	 * Get the frequency of a note.
@@ -44,20 +51,20 @@
 		}
 	}
 
+	const noteDuration = 175;
 	const marioNotes = [
-		9, 9, 0, 9, 0, 13, 9, 0, 6, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 18, 0, 0, 21, 0, 0, 16, 0, 14, 0, 15,
+		9, 9, 0, 9, 0, 13, 9, 0, 6, 0, 0, 0, 0, 0, 0, 13, 0, 0, 18, 0, 0, 21, 0, 0, 16, 0, 14, 0, 15,
 		16, 0, 18, 9, 6, 4, 0, 8, 6, 0, 8, 6, 0, 9, 0, 13, 11, 13
 	];
 
 	/**
 	 * Beeps a sound
 	 * @param {AudioContext} ctx
 	 * @param {number} freq
-	 * @param {number} duration
 	 * @param {number} vol
 	 * @returns {void}
 	 */
-	function beep(ctx, freq = 520, duration = 200, vol = 100) {
+	function beep(ctx, freq, vol = 5) {
 		const oscillator = ctx.createOscillator();
 		const gain = ctx.createGain();
 		oscillator.connect(gain);
@@ -66,27 +73,26 @@
 		gain.connect(ctx.destination);
 		gain.gain.value = vol * 0.01;
 		oscillator.start(ctx.currentTime);
-		oscillator.stop(ctx.currentTime + duration * 0.001);
+		oscillator.stop(ctx.currentTime + noteDuration * 0.001);
 	}
 
-	/** @returns {Promise<void>} */
-	async function playTimerSound() {
-		const ctx = new window.AudioContext();
-		for (const note of marioNotes) {
-			await sleep(200);
-			beep(ctx, getFrequency(note));
+	/**
+	 * Plays the timer sound
+	 * @param {AudioContext} ctx
+	 * @returns {Promise<void>}
+	 */
+	async function playTimerSound(ctx) {
+		while (beeping) {
+			for (const note of marioNotes) {
+				if (!beeping) return;
+				await sleep(noteDuration);
+				if (!beeping) return;
+				beep(ctx, getFrequency(note));
+			}
 		}
 	}
 
-	/** @returns {void} */
-	function startBeeping() {
-		playTimerSound();
-		beepingInterval = setInterval(playTimerSound, 200 * marioNotes.length);
-	}
-
 	$effect(() => {
-		if (beeping) {
-			startBeeping();
-		}
+		if (beeping && ctx) playTimerSound(ctx);
 	});
 </script>
diff --git a/src/lib/components/gadgets/timer/main.svelte b/src/lib/components/gadgets/timer/main.svelte
@@ -14,14 +14,6 @@
 	const [initHours, initMinutes, initSeconds] = timeFromTimery(query);
 
 	let beeping = $state(false);
-	/** @type {number|undefined} */
-	let beepingInterval = $state(undefined);
-	$effect(() => {
-		// Dummy IF to trigger the effect.
-		if (query) {
-		}
-		clearInterval(beepingInterval);
-	});
 
 	/** @type {HTMLElement | null} */
 	let timerNumbersContainer = $state(null);
@@ -89,7 +81,6 @@
 	function toggleState() {
 		if (beeping) {
 			beeping = false;
-			clearInterval(beepingInterval);
 			return;
 		}
 
@@ -146,11 +137,6 @@
 			case 'Enter':
 				editMode = false;
 				break;
-			// This breaks the input fields.
-			// case ' ':
-			// 	event.preventDefault();
-			// 	toggleState();
-			// 	break;
 		}
 	}}
 	onclick={({ target }) => {
@@ -162,7 +148,7 @@
 	}}
 />
 
-<Beeper {beeping} bind:beepingInterval />
+<Beeper {beeping} />
 
 <div class="mx-auto max-w-screen-sm">
 	<div class="mx-2 mt-2 border-2 border-neutral-200 dark:border-neutral-600 rounded-xl">
@@ -196,22 +182,6 @@
 					>
 						<path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z" />
 					</svg>
-					<!-- <svg
-						class:hidden={beeping}
-						class="text-gray-200 animate-pulse dark:text-gray-600 fill-blue-600"
-						viewBox="0 0 100 101"
-						fill="none"
-						xmlns="http://www.w3.org/2000/svg"
-					>
-						<path
-							d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-							fill="currentColor"
-						/>
-						<path
-							d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-							fill="currentFill"
-						/>
-					</svg> -->
 				</button>
 			</div>
 			<div bind:this={timerNumbersContainer}>