cleanup internal stores

This commit is contained in:
Ollie Taylor
2023-02-24 13:47:07 +00:00
parent 3ac7346cdd
commit 20fc307099
3 changed files with 52 additions and 48 deletions
+24 -33
View File
@@ -1,36 +1,27 @@
import type { PlayerElement, PlayerMetadata } from '$lib/types/types';
import {
audio_current_time,
audio_element,
audio_metadata,
audio_src,
} from '$lib/context/audio-internals';
import { secondsToTimestamp } from '$lib/utility/seconds-to-timestamp';
import { info, warn } from '$pkg/log';
import clamp from 'just-clamp';
import { derived, writable } from 'svelte/store';
import { derived } from 'svelte/store';
export const __internal_audio_current_time = writable<number>(0);
export const __internal_audio_src = writable<string | null>(null);
export const __internal_audio_element = writable<PlayerElement>();
export const __internal_audio_metadata = writable<PlayerMetadata>({
duration: 0,
muted: false,
paused: true,
playbackRate: 1,
loading: false,
const audio_state = derived([audio_metadata, audio_current_time], ([$metadata, $current_time]) => {
return {
current_time: $current_time,
timestamp: secondsToTimestamp($current_time),
...$metadata,
};
});
const state = derived(
[__internal_audio_metadata, __internal_audio_current_time],
([$metadata, $current_time]) => {
return {
current_time: $current_time,
timestamp: secondsToTimestamp($current_time),
...$metadata,
};
},
);
type HandleType = 'toggle' | 'set';
function play(type: HandleType = 'set') {
info('play: ', type);
return __internal_audio_element.subscribe((el) => {
return audio_element.subscribe((el) => {
if (!el) return warn('no audio element');
if (type === 'toggle') {
el.paused ? el.play() : el.pause();
@@ -41,7 +32,7 @@ function play(type: HandleType = 'set') {
}
function pause(type: HandleType = 'set') {
info('pause: ', type);
return __internal_audio_element.subscribe((el) => {
return audio_element.subscribe((el) => {
if (!el) return warn('no audio element');
if (type === 'toggle') {
el.paused ? el.play() : el.pause();
@@ -53,7 +44,7 @@ function pause(type: HandleType = 'set') {
function mute(type: HandleType = 'set') {
info('mute: ', type);
return __internal_audio_element.subscribe((el) => {
return audio_element.subscribe((el) => {
if (!el) return warn('no audio element');
if (type === 'toggle') {
el.muted = !el.muted;
@@ -64,7 +55,7 @@ function mute(type: HandleType = 'set') {
}
function unmute(type: HandleType = 'set') {
info('unmute: ', type);
return __internal_audio_element.subscribe((el) => {
return audio_element.subscribe((el) => {
if (!el) return warn('no audio element');
if (type === 'toggle') {
el.muted = !el.muted;
@@ -76,8 +67,8 @@ function unmute(type: HandleType = 'set') {
function load(src: string) {
info('load: ', src);
__internal_audio_src.set(src);
return __internal_audio_element.subscribe((el) => {
audio_src.set(src);
return audio_element.subscribe((el) => {
if (!el) return warn('no audio element');
el.volume = 1;
el.pause();
@@ -85,12 +76,12 @@ function load(src: string) {
}
function unload() {
info('unload: ');
__internal_audio_src.set(null);
audio_src.set(null);
}
function setPlaybackRate(rate: number) {
info('setPlaybackRate: ', rate);
return __internal_audio_element.subscribe((el) => {
return audio_element.subscribe((el) => {
if (!el) return warn('no audio element');
el.playbackRate = clamp(0, 10, rate);
})();
@@ -98,7 +89,7 @@ function setPlaybackRate(rate: number) {
function seek(seconds: number, from: 'from-start' | 'from-end' = 'from-start') {
info('seek: ', seconds, from);
return __internal_audio_element.subscribe((el) => {
return audio_element.subscribe((el) => {
if (!el) return warn('no audio element');
if (from === 'from-end') {
el.currentTime = clamp(0, el.duration, el.duration - seconds);
@@ -110,7 +101,7 @@ function seek(seconds: number, from: 'from-start' | 'from-end' = 'from-start') {
function skip(seconds: number, type: 'forward' | 'backward' = 'forward') {
info('skip: ', seconds, type);
return __internal_audio_element.subscribe((el) => {
return audio_element.subscribe((el) => {
if (!el) return warn('no audio element');
if (type === 'backward') {
el.currentTime = clamp(0, el.duration, el.currentTime - seconds);
@@ -121,7 +112,7 @@ function skip(seconds: number, type: 'forward' | 'backward' = 'forward') {
}
export const audio = {
subscribe: state.subscribe,
subscribe: audio_state.subscribe,
play,
pause,
mute,