fix(volume): restore pre-mute volume on unmute (#48)
Mute now saves the current volume before setting to 0, and unmute restores it. Pre-mute volume persists in localStorage across sessions. Centralized toggleMute in playerStore so all UI components (NowPlayingBar, immersive VolumeSlider) behave consistently. Also moved session volume persistence into setVolume to avoid duplication.
This commit is contained in:
1 parent
348d57e84f
commit
2f5f5ff8a6
4 files changed
+34
-5
No files matched your search
@@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
import { invoke } from '@tauri-apps/api/core';
|
||||
import { saveSessionVolume } from '$lib/services/sessionService';
|
||||
|
||||
/**
|
||||
* Get the preferred streaming quality from localStorage
|
||||
@@ -122,6 +123,7 @@ let isPlaying = false;
|
||||
let currentTime = 0;
|
||||
let duration = 0;
|
||||
let volume = loadPersistedVolume();
|
||||
let preMuteVolume: number | null = null; // Volume before mute, null when not muted
|
||||
let isFavorite = false;
|
||||
// Event listener state (replaces polling)
|
||||
let eventUnlisten: UnlistenFn | null = null;
|
||||
@@ -385,6 +387,7 @@ export async function setVolume(newVolume: number): Promise<void> {
|
||||
const clampedVolume = Math.max(0, Math.min(100, newVolume));
|
||||
volume = clampedVolume;
|
||||
persistVolume(clampedVolume);
|
||||
saveSessionVolume(clampedVolume / 100);
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
@@ -401,6 +404,33 @@ export async function setVolume(newVolume: number): Promise<void> {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle mute: saves current volume before muting, restores it on unmute.
|
||||
* Persists pre-mute volume in localStorage so it survives across sessions.
|
||||
*/
|
||||
export async function toggleMute(): Promise<void> {
|
||||
if (volume > 0) {
|
||||
// Mute: save current volume and set to 0
|
||||
preMuteVolume = volume;
|
||||
if (typeof localStorage !== 'undefined') {
|
||||
localStorage.setItem('qbz-pre-mute-volume', String(volume));
|
||||
}
|
||||
await setVolume(0);
|
||||
} else {
|
||||
// Unmute: restore saved volume
|
||||
let restoreVolume = preMuteVolume;
|
||||
if (restoreVolume === null && typeof localStorage !== 'undefined') {
|
||||
const stored = localStorage.getItem('qbz-pre-mute-volume');
|
||||
if (stored) restoreVolume = parseFloat(stored);
|
||||
}
|
||||
preMuteVolume = null;
|
||||
if (typeof localStorage !== 'undefined') {
|
||||
localStorage.removeItem('qbz-pre-mute-volume');
|
||||
}
|
||||
await setVolume(restoreVolume && restoreVolume > 0 ? restoreVolume : 75);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Stop playback
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user