From fde7ab432f03d489f2ad406d51987ae6d3ae2e65 Mon Sep 17 00:00:00 2001 From: Psychotoxical <171614930+Psychotoxical@users.noreply.github.com> Date: Thu, 18 Jun 2026 13:31:38 +0200 Subject: [PATCH] feat: split AutoDJ into a standalone playback feature (#1124) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(playback): add transition-mode helper Centralise the crossfade/AutoDJ/gapless mutual exclusivity in one place instead of the scattered setter combinations across the toolbar, mini player and settings. AutoDJ stays encoded as crossfade + trim-silence, so the persisted flags and the audio engine are unchanged. * feat(queue): split AutoDJ into its own toolbar button + playlist submenu - AutoDJ becomes a standalone toolbar button (Blend icon) next to crossfade, driven by the shared transition-mode helper. The crossfade right-click popover drops the mode switch and keeps only the seconds slider. - Save + load playlist collapse into one Playlist button opening a small submenu, freeing up toolbar space. - queueToolbarStore gains a position-preserving rehydrate migration (legacy save/load -> playlist, autodj inserted after crossfade) with unit tests. - Toolbar customizer and all 9 queue locales updated to match. * feat(mini-player): standalone AutoDJ button, shared transition helper Mirror the queue toolbar: AutoDJ gets its own Blend button, the crossfade popover keeps only the seconds slider. The mini player now drives all three transitions through a single additive `mini:set-transition-mode` event handled by the shared helper, replacing the per-flag mini events. Drop the now-dead crossfade-mode CSS. * feat(settings): segmented track-transition picker, regroup playback Replace the crossfade toggle + inner crossfade/AutoDJ switch with a single Off | Gapless | Crossfade | AutoDJ segmented control (mirroring the Normalization picker above), driven by the shared transition helper — the mutual exclusivity now reads at a glance. Crossfade keeps its seconds slider; AutoDJ shows its content-driven explainer. The block is regrouped under "Track transitions" and "Queue behaviour" headings. Drops the now unused crossfade/gapless description and not-available i18n keys across all 9 locales and adds the new transition strings. * fix(queue): open the playlist submenu inward The playlist submenu inherited the crossfade popover's right:0 anchor and, sitting on the left of the toolbar, opened out under the main container. Anchor it left:0 so it stays inside the queue panel. Update the toolbar test for the new playlist submenu (save/load moved off the toolbar). * feat(settings): box playback sub-sections into panels Wrap Normalization, Track transitions and Queue behaviour each in their own bordered panel with an accent uppercase header (new reusable .settings-group classes), so the sections read as distinct blocks instead of one wall of text. Drops the thin divider that separated them. * docs: changelog, credits and what's new for AutoDJ standalone Fold the standalone-AutoDJ changes into the existing AutoDJ entry in the changelog and the in-app What's New, and add the credit (#1124). --- CHANGELOG.md | 5 +- WHATS_NEW.md | 2 +- src/components/QueuePanel.test.tsx | 20 +- src/components/QueuePanel.tsx | 8 +- src/components/miniPlayer/MiniToolbar.tsx | 83 ++++---- src/components/queuePanel/QueueToolbar.tsx | 178 ++++++++++-------- src/components/settings/AudioTab.tsx | 3 - .../settings/QueueToolbarCustomizer.tsx | 10 +- .../settings/audio/NormalizationBlock.tsx | 12 +- .../settings/audio/PlaybackBehaviorBlock.tsx | 168 ++++++++--------- src/config/settingsCredits.ts | 1 + src/locales/de/queue.ts | 2 + src/locales/de/settings.ts | 10 +- src/locales/en/queue.ts | 2 + src/locales/en/settings.ts | 10 +- src/locales/es/queue.ts | 2 + src/locales/es/settings.ts | 10 +- src/locales/fr/queue.ts | 2 + src/locales/fr/settings.ts | 10 +- src/locales/nb/queue.ts | 2 + src/locales/nb/settings.ts | 10 +- src/locales/nl/queue.ts | 2 + src/locales/nl/settings.ts | 10 +- src/locales/ro/queue.ts | 2 + src/locales/ro/settings.ts | 10 +- src/locales/ru/queue.ts | 2 + src/locales/ru/settings.ts | 10 +- src/locales/zh/queue.ts | 2 + src/locales/zh/settings.ts | 10 +- src/store/queueToolbarStore.test.ts | 87 +++++++++ src/store/queueToolbarStore.ts | 80 ++++++-- src/styles/components/mini-player-window.css | 33 ---- src/styles/components/settings.css | 29 +++ src/styles/layout/queue-panel.css | 40 ++++ src/utils/miniPlayerBridge.ts | 25 +-- src/utils/playback/playbackTransition.test.ts | 85 +++++++++ src/utils/playback/playbackTransition.ts | 60 ++++++ 37 files changed, 665 insertions(+), 372 deletions(-) create mode 100644 src/store/queueToolbarStore.test.ts create mode 100644 src/utils/playback/playbackTransition.test.ts create mode 100644 src/utils/playback/playbackTransition.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fa2810d..26157a3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,9 +28,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### AutoDJ — content-aware crossfade -**By [@cucadmuh](https://github.com/cucadmuh), PR [#1122](https://github.com/Psychotoxical/psysonic/pull/1122)** +**By [@cucadmuh](https://github.com/cucadmuh), PR [#1122](https://github.com/Psychotoxical/psysonic/pull/1122) and [@Psychotoxical](https://github.com/Psychotoxical), PR [#1124](https://github.com/Psychotoxical/psysonic/pull/1124)** -* New **AutoDJ** crossfade mode (next to classic Crossfade in the audio settings and the crossfade popover). Instead of a fixed crossfade time, it blends what you actually hear: it trims the dead silence at the end of one track and the start of the next, and picks the overlap from the music itself — a track that fades out rides its own fade while the next one rises underneath, and two tracks that both start/end loud get a short musical blend instead of an abrupt cut. Off by default; classic Crossfade is unchanged. Works most reliably with the Hot playback cache enabled, since the next track's audio needs to be ready for the blend. +* New **AutoDJ** crossfade mode. Instead of a fixed crossfade time, it blends what you actually hear: it trims the dead silence at the end of one track and the start of the next, and picks the overlap from the music itself — a track that fades out rides its own fade while the next one rises underneath, and two tracks that both start/end loud get a short musical blend instead of an abrupt cut. Works most reliably with the Hot playback cache enabled, since the next track's audio needs to be ready for the blend. +* AutoDJ is now its own mode rather than a sub-option of Crossfade — its own button in the queue toolbar and its own entry in the audio settings. Crossfade, AutoDJ and Gapless are mutually exclusive (only one active at a time) under a single Off / Gapless / Crossfade / AutoDJ picker, the playback settings are regrouped into clearer Normalization / Track transitions / Queue behaviour panels, and the queue toolbar's separate Save and Load playlist buttons are combined into one Playlist menu (existing toolbar layouts are preserved). Off by default; classic Crossfade is unchanged. ## Fixed diff --git a/WHATS_NEW.md b/WHATS_NEW.md index 0b676834..36aa2d2c 100644 --- a/WHATS_NEW.md +++ b/WHATS_NEW.md @@ -14,7 +14,7 @@ Within each section, order by **user impact** (most noticeable first) — not PR ### AutoDJ — minimum pauses, maximum music -- New **AutoDJ** mode in **Settings → Audio** and the crossfade popover — a smart crossfade that blends tracks intelligently. Each transition is shaped to fit the music: awkward gaps fade away, handovers feel natural, and you spend less time in silence between songs. Off by default; classic **Crossfade** is unchanged. +- New **AutoDJ** mode — a smart crossfade that blends tracks intelligently. Each transition is shaped to fit the music: awkward gaps fade away, handovers feel natural, and you spend less time in silence between songs. It's now its own choice in **Settings → Audio** and its own button in the queue toolbar, sitting alongside Crossfade and Gapless — pick one at a time. Off by default; classic **Crossfade** is unchanged. ### Playlist folders — your playlists, organised diff --git a/src/components/QueuePanel.test.tsx b/src/components/QueuePanel.test.tsx index 8a6189f6..ca28093c 100644 --- a/src/components/QueuePanel.test.tsx +++ b/src/components/QueuePanel.test.tsx @@ -31,6 +31,7 @@ vi.mock('@/utils/orbitBulkGuard', () => ({ })); import QueuePanel from './QueuePanel'; +import { fireEvent } from '@testing-library/react'; import { renderWithProviders } from '@/test/helpers/renderWithProviders'; import { usePlayerStore } from '@/store/playerStore'; import { useAuthStore } from '@/store/authStore'; @@ -164,15 +165,28 @@ describe('QueuePanel — display mode', () => { }); describe('QueuePanel — toolbar', () => { - it('exposes Shuffle / Save Playlist / Load Playlist / Share Queue / Clear via aria-label', () => { + it('exposes Shuffle / Playlist / Share Queue / Clear / AutoDJ via aria-label', () => { const tracks = makeTracks(3); seedQueue(tracks, { index: 0, currentTrack: tracks[0] }); const { getByLabelText } = renderWithProviders(); expect(getByLabelText('Shuffle queue')).toBeInTheDocument(); - expect(getByLabelText('Save Playlist')).toBeInTheDocument(); - expect(getByLabelText('Load Playlist')).toBeInTheDocument(); + expect(getByLabelText('Playlist')).toBeInTheDocument(); expect(getByLabelText('Copy queue share link')).toBeInTheDocument(); expect(getByLabelText('Clear queue')).toBeInTheDocument(); + expect(getByLabelText('AutoDJ')).toBeInTheDocument(); + }); + + it('Save and Load live inside the Playlist submenu, not directly on the toolbar', () => { + const tracks = makeTracks(3); + seedQueue(tracks, { index: 0, currentTrack: tracks[0] }); + const { getByLabelText, container } = renderWithProviders(); + // The submenu is closed initially. + expect(container.querySelector('.queue-menu')).toBeNull(); + fireEvent.click(getByLabelText('Playlist')); + const menu = container.querySelector('.queue-menu'); + expect(menu).not.toBeNull(); + expect(menu?.textContent).toContain('Save Playlist'); + expect(menu?.textContent).toContain('Load Playlist'); }); it('Shuffle button is disabled when the queue has fewer than 2 tracks', () => { diff --git a/src/components/QueuePanel.tsx b/src/components/QueuePanel.tsx index d40431c0..305822c7 100644 --- a/src/components/QueuePanel.tsx +++ b/src/components/QueuePanel.tsx @@ -109,10 +109,7 @@ function QueuePanelHostOrSolo() { const crossfadeTrimSilence = useAuthStore(s => s.crossfadeTrimSilence); const gaplessEnabled = useAuthStore(s => s.gaplessEnabled); const infiniteQueueEnabled = useAuthStore(s => s.infiniteQueueEnabled); - const setCrossfadeEnabled = useAuthStore(s => s.setCrossfadeEnabled); const setCrossfadeSecs = useAuthStore(s => s.setCrossfadeSecs); - const setCrossfadeTrimSilence = useAuthStore(s => s.setCrossfadeTrimSilence); - const setGaplessEnabled = useAuthStore(s => s.setGaplessEnabled); const setInfiniteQueueEnabled = useAuthStore(s => s.setInfiniteQueueEnabled); const normalizationEngine = useAuthStore(s => s.normalizationEngine); @@ -337,13 +334,10 @@ function QueuePanelHostOrSolo() { handleCopyQueueShare={handleCopyQueueShare} handleClear={handleClear} gaplessEnabled={gaplessEnabled} - setGaplessEnabled={setGaplessEnabled} crossfadeEnabled={crossfadeEnabled} - setCrossfadeEnabled={setCrossfadeEnabled} + crossfadeTrimSilence={crossfadeTrimSilence} crossfadeSecs={crossfadeSecs} setCrossfadeSecs={setCrossfadeSecs} - crossfadeTrimSilence={crossfadeTrimSilence} - setCrossfadeTrimSilence={setCrossfadeTrimSilence} infiniteQueueEnabled={infiniteQueueEnabled} setInfiniteQueueEnabled={setInfiniteQueueEnabled} t={t} diff --git a/src/components/miniPlayer/MiniToolbar.tsx b/src/components/miniPlayer/MiniToolbar.tsx index fd179617..c451047c 100644 --- a/src/components/miniPlayer/MiniToolbar.tsx +++ b/src/components/miniPlayer/MiniToolbar.tsx @@ -1,9 +1,10 @@ import React from 'react'; import { createPortal } from 'react-dom'; import { emit } from '@tauri-apps/api/event'; -import { Infinity as InfinityIcon, ListMusic, MoveRight, Shuffle, Volume2, VolumeX, Waves } from 'lucide-react'; +import { Blend, Infinity as InfinityIcon, ListMusic, MoveRight, Shuffle, Volume2, VolumeX, Waves } from 'lucide-react'; import type { TFunction } from 'i18next'; import type { MiniSyncPayload } from '../../utils/miniPlayerBridge'; +import { getTransitionMode } from '../../utils/playback/playbackTransition'; interface Props { state: MiniSyncPayload; @@ -31,6 +32,8 @@ export function MiniToolbar({ crossfadeOpen, setCrossfadeOpen, crossfadeBtnRef, crossfadePopRef, crossfadePopStyle, queueOpen, toggleQueue, t, }: Props) { + const mode = getTransitionMode(state); + return (
@@ -108,8 +111,8 @@ export function MiniToolbar({ - +
+ + {t('queue.crossfade')} + {(state.crossfadeSecs ?? 3).toFixed(1)} s
- {!state.crossfadeTrimSilence && ( - <> -
- - {t('queue.crossfade')} - {(state.crossfadeSecs ?? 3).toFixed(1)} s -
- emit('mini:set-crossfade-secs', { value: parseFloat(e.target.value) }).catch(() => {})} - className="mini-player__crossfade-slider" - aria-label={t('queue.crossfade')} - /> - - )} + { + emit('mini:set-crossfade-secs', { value: parseFloat(e.target.value) }).catch(() => {}); + emit('mini:set-transition-mode', { value: 'crossfade' }).catch(() => {}); + }} + className="mini-player__crossfade-slider" + aria-label={t('queue.crossfade')} + />
, document.body, )} + + ); - case 'save': + case 'playlist': return ( - - ); - case 'load': - return ( - +
+ + {showPlaylistMenu && ( +
+ + +
+ )} +
); case 'share': return ( @@ -112,8 +137,8 @@ export function QueueToolbar({ return ( {showCrossfadePopover && (
-
- - +
+ + {t('queue.crossfade')} + {crossfadeSecs.toFixed(1)} s +
+ { + setCrossfadeSecs(parseFloat(e.target.value)); + setTransitionMode('crossfade'); + }} + className="crossfade-popover-slider" + aria-label={t('queue.crossfade')} + /> +
+ 0.1s10s
- {!crossfadeTrimSilence && ( - <> -
- - {t('queue.crossfade')} - {crossfadeSecs.toFixed(1)} s -
- { - setCrossfadeSecs(parseFloat(e.target.value)); - setCrossfadeEnabled(true); - }} - className="crossfade-popover-slider" - /> -
- 0.1s10s -
- - )}
)}
); + case 'autodj': + return ( + + ); case 'infinite': return (
)} - + ); } diff --git a/src/components/settings/audio/PlaybackBehaviorBlock.tsx b/src/components/settings/audio/PlaybackBehaviorBlock.tsx index fae117ac..f0e78a55 100644 --- a/src/components/settings/audio/PlaybackBehaviorBlock.tsx +++ b/src/components/settings/audio/PlaybackBehaviorBlock.tsx @@ -1,119 +1,99 @@ import React from 'react'; import type { TFunction } from 'i18next'; import { useAuthStore } from '../../../store/authStore'; +import { + getTransitionMode, + setTransitionMode, + type TransitionMode, +} from '../../../utils/playback/playbackTransition'; interface Props { t: TFunction; } /** - * Crossfade ↔ Gapless are mutually exclusive — enabling one forces the - * other off (`setGaplessEnabled(false)` / `setCrossfadeEnabled(false)` - * on the toggle handlers) and the inactive row dims via opacity + - * pointerEvents:none. + * Track-transition picker. Crossfade, AutoDJ and Gapless are mutually + * exclusive — only one can be active — so they are presented as a single + * `Off | Gapless | Crossfade | AutoDJ` segmented control (mirroring the + * Normalization picker above it) backed by the shared transition-mode helper. * - * When crossfade is on, a "Crossfade | Smart crossfade" segmented switch - * (`crossfadeTrimSilence` false/true) picks the mode: classic crossfade - * exposes the seconds slider, smart crossfade is content-driven and has - * no duration to configure (just a short explainer). - * - * The `preservePlayNextOrder` toggle is independent of both and pinned - * to the bottom of the block. + * Classic crossfade exposes the seconds slider; AutoDJ is content-driven and + * has no duration to configure (just a short explainer). The + * `preservePlayNextOrder` toggle is independent and grouped under its own + * "Queue behaviour" heading at the bottom. */ export function PlaybackBehaviorBlock({ t }: Props) { const auth = useAuthStore(); + const mode = getTransitionMode(auth); + + const transitions: { id: TransitionMode; label: string }[] = [ + { id: 'none', label: t('settings.transitionOff') }, + { id: 'gapless', label: t('settings.gapless') }, + { id: 'crossfade', label: t('settings.crossfade') }, + { id: 'autodj', label: t('settings.autoDj') }, + ]; return ( <> -
-
-
- {t('settings.crossfade')} -
-
- {auth.gaplessEnabled ? t('settings.notWithGapless') : t('settings.crossfadeDesc')} -
-
- -
- {auth.crossfadeEnabled && !auth.gaplessEnabled && ( -
-
- - -
- {auth.crossfadeTrimSilence ? ( -
- {t('settings.autoDjDesc')} -
- ) : ( -
- auth.setCrossfadeSecs(parseFloat(e.target.value))} - style={{ flex: 1, minWidth: 80, maxWidth: 200 }} - id="crossfade-secs-slider" - /> - - {t('settings.crossfadeSecs', { n: auth.crossfadeSecs.toFixed(1) })} - -
- )} -
- )} +
+
{t('settings.transitionsTitle')}
+
{t('settings.transitionsDesc')}
-
- -
-
-
- {t('settings.gapless')} -
-
- {auth.crossfadeEnabled ? t('settings.notWithCrossfade') : t('settings.gaplessDesc')} -
+
+ {transitions.map(item => ( + + ))}
- + + {mode === 'crossfade' && ( +
+ auth.setCrossfadeSecs(parseFloat(e.target.value))} + style={{ flex: 1, minWidth: 80, maxWidth: 200 }} + id="crossfade-secs-slider" + /> + + {t('settings.crossfadeSecs', { n: auth.crossfadeSecs.toFixed(1) })} + +
+ )} + {mode === 'autodj' && ( +
+ {t('settings.autoDjDesc')} +
+ )}
-
-
-
- {t('settings.preservePlayNextOrder')} -
-
- {t('settings.preservePlayNextOrderDesc')} +
+
{t('settings.queueBehaviourTitle')}
+ +
+
+
+ {t('settings.preservePlayNextOrder')} +
+
+ {t('settings.preservePlayNextOrderDesc')} +
+
-
); diff --git a/src/config/settingsCredits.ts b/src/config/settingsCredits.ts index 3cd6f877..67949d28 100644 --- a/src/config/settingsCredits.ts +++ b/src/config/settingsCredits.ts @@ -372,6 +372,7 @@ const CONTRIBUTOR_ENTRIES = [ 'Performance Probe: opt-in thread-group CPU poll toggle and includeThreadGroups IPC fix (PR #891)', 'Queue: switchable display mode — Queue (upcoming only) vs Playlist (full list), with header toggle and settings entry (PR #922)', 'Community Theme Store: semantic-token refactor, dedicated Themes tab with day/night scheduler, install/update/uninstall, local .zip import, free-form community themes (safety floor + state-reactive styling), and per-theme download counts with popularity/newest/name sorting; 80+ palettes moved to an on-demand CDN repo (PR #1009, #1011, #1012, #1013, #1014, #1015, #1016, #1018, #1020, #1036)', + 'AutoDJ as a standalone playback mode — own toolbar button and audio-settings entry, mutually exclusive with Crossfade and Gapless via a shared transition helper, combined playlist save/load submenu, and boxed playback settings sections (PR #1124)', ], }, { diff --git a/src/locales/de/queue.ts b/src/locales/de/queue.ts index b45b7718..9d2aacc1 100644 --- a/src/locales/de/queue.ts +++ b/src/locales/de/queue.ts @@ -22,7 +22,9 @@ export const queue = { shuffle: 'Warteschlange mischen', gapless: 'Nahtlos', crossfade: 'Crossfade', + autoDj: 'AutoDJ', infiniteQueue: 'Endlose Warteschlange', + playlist: 'Playlist', autoAdded: '— Automatisch hinzugefügt —', radioAdded: '— Radio —', hide: 'Verbergen', diff --git a/src/locales/de/settings.ts b/src/locales/de/settings.ts index 8e4170e6..561dd0cc 100644 --- a/src/locales/de/settings.ts +++ b/src/locales/de/settings.ts @@ -564,16 +564,14 @@ export const settings = { loudnessFirstPlayNote: 'Beim ersten Abspielen eines neuen Titels kann die Lautstärke kurz schwanken, während gemessen wird. Beim nächsten Mal greift die gespeicherte Messung und alles bleibt stabil. Kommende Queue-Titel werden meist schon während des vorherigen Songs analysiert — in der Praxis tritt das daher selten auf.', crossfade: 'Crossfade', - crossfadeDesc: 'Überblendung zwischen Tracks', crossfadeSecs: '{{n}} s', - crossfadeTrimSilence: 'Stille zwischen Tracks kürzen', - crossfadeTrimSilenceDesc: 'Stille am Ende des aktuellen und am Anfang des nächsten Tracks überspringen, damit die Überblendung Musik statt Leere überlappt. Für zuverlässige Ergebnisse den Hot-Playback-Cache aktivieren, damit der nächste Track rechtzeitig bereit ist', autoDj: 'AutoDJ', autoDjDesc: 'Keine feste Dauer — AutoDJ richtet sich nach dem tatsächlichen Klang und überlappt echte Aus- und Einblendungen statt einer festen Sekundenzahl. Für zuverlässige Ergebnisse den Hot-Playback-Cache aktivieren.', - notWithGapless: 'Nicht verfügbar wenn Nahtlose Wiedergabe aktiv ist', - notWithCrossfade: 'Nicht verfügbar wenn Crossfade aktiv ist', gapless: 'Nahtlose Wiedergabe', - gaplessDesc: 'Nächsten Track vorpuffern um Lücken zwischen Songs zu vermeiden', + transitionsTitle: 'Übergänge zwischen Tracks', + transitionsDesc: 'Wie aufeinanderfolgende Tracks ineinander übergehen. Es kann immer nur ein Modus aktiv sein.', + transitionOff: 'Aus', + queueBehaviourTitle: 'Warteschlangen-Verhalten', preservePlayNextOrder: '„Als Nächstes"-Reihenfolge bewahren', preservePlayNextOrderDesc: 'Neu hinzugefügte „Als Nächstes"-Titel reihen sich hinten an statt sich vorn einzuschieben.', trackPreviewsTitle: 'Track-Vorschau', diff --git a/src/locales/en/queue.ts b/src/locales/en/queue.ts index 3e13ae26..5c427cdc 100644 --- a/src/locales/en/queue.ts +++ b/src/locales/en/queue.ts @@ -22,7 +22,9 @@ export const queue = { shuffle: 'Shuffle queue', gapless: 'Gapless', crossfade: 'Crossfade', + autoDj: 'AutoDJ', infiniteQueue: 'Infinite Queue', + playlist: 'Playlist', autoAdded: '— Added automatically —', radioAdded: '— Radio —', hide: 'Hide', diff --git a/src/locales/en/settings.ts b/src/locales/en/settings.ts index ed975cf7..ea3ebbbf 100644 --- a/src/locales/en/settings.ts +++ b/src/locales/en/settings.ts @@ -631,16 +631,14 @@ export const settings = { loudnessFirstPlayNote: 'First play of a brand-new track may briefly drift in volume while it is being measured. The next play uses the cached measurement and is rock-solid. Upcoming queue tracks are usually pre-analysed during the previous song, so this rarely happens in practice.', crossfade: 'Crossfade', - crossfadeDesc: 'Fade between tracks', crossfadeSecs: '{{n}} s', - crossfadeTrimSilence: 'Trim silence between tracks', - crossfadeTrimSilenceDesc: 'Skip trailing silence of the current track and leading silence of the next so the fade overlaps music, not dead air. For reliable results, enable the Hot playback cache so the next track is ready in time', autoDj: 'AutoDJ', autoDjDesc: 'No fixed duration — AutoDJ follows the actual audio, blending real fade-outs and intros instead of a set number of seconds. For reliable results, enable the Hot playback cache.', - notWithGapless: 'Not available while Gapless is active', - notWithCrossfade: 'Not available while Crossfade is active', gapless: 'Gapless Playback', - gaplessDesc: 'Pre-buffer next track to eliminate gaps between songs', + transitionsTitle: 'Track transitions', + transitionsDesc: 'How consecutive tracks blend together. Only one mode can be active at a time.', + transitionOff: 'Off', + queueBehaviourTitle: 'Queue behaviour', preservePlayNextOrder: 'Preserve "Play Next" order', preservePlayNextOrderDesc: 'Newly added Play Next items queue up behind earlier ones instead of jumping in front.', trackPreviewsTitle: 'Track Previews', diff --git a/src/locales/es/queue.ts b/src/locales/es/queue.ts index 4f95f29b..7f6d81c3 100644 --- a/src/locales/es/queue.ts +++ b/src/locales/es/queue.ts @@ -22,7 +22,9 @@ export const queue = { shuffle: 'Mezclar cola', gapless: 'Gapless', crossfade: 'Crossfade', + autoDj: 'AutoDJ', infiniteQueue: 'Cola Infinita', + playlist: 'Lista', autoAdded: '— Agregado automáticamente —', radioAdded: '— Radio —', hide: 'Ocultar', diff --git a/src/locales/es/settings.ts b/src/locales/es/settings.ts index d40a597b..83bdc0e9 100644 --- a/src/locales/es/settings.ts +++ b/src/locales/es/settings.ts @@ -563,16 +563,14 @@ export const settings = { loudnessFirstPlayNote: 'En la primera reproducción de un tema nuevo el volumen puede oscilar brevemente mientras se mide. La siguiente vez se usa la medición guardada y todo permanece estable. Las pistas próximas en la cola suelen analizarse durante la canción anterior, por lo que en la práctica esto rara vez ocurre.', crossfade: 'Crossfade', - crossfadeDesc: 'Transición entre pistas', crossfadeSecs: '{{n}} s', - crossfadeTrimSilence: 'Recortar el silencio entre pistas', - crossfadeTrimSilenceDesc: 'Omite el silencio al final de la pista actual y al inicio de la siguiente para que la transición se solape con la música, no con el vacío. Para resultados fiables, activa la Caché de reproducción activa para que la siguiente pista esté lista a tiempo', autoDj: 'AutoDJ', autoDjDesc: 'Sin duración fija: AutoDJ se adapta al audio real y se solapa con los fundidos e introducciones reales en lugar de un número fijo de segundos. Para resultados fiables, activa la Caché de reproducción activa.', - notWithGapless: 'No disponible mientras Gapless está activo', - notWithCrossfade: 'No disponible mientras Crossfade está activo', gapless: 'Reproducción Gapless', - gaplessDesc: 'Precarga siguiente pista para eliminar silencios entre canciones', + transitionsTitle: 'Transiciones entre pistas', + transitionsDesc: 'Cómo se enlazan las pistas consecutivas. Solo un modo puede estar activo a la vez.', + transitionOff: 'Desactivado', + queueBehaviourTitle: 'Comportamiento de la cola', preservePlayNextOrder: 'Mantener el orden de "Reproducir Siguiente"', preservePlayNextOrderDesc: 'Los elementos añadidos a "Reproducir Siguiente" se encolan detrás de los anteriores en vez de saltar al principio.', trackPreviewsTitle: 'Previsualizaciones de pistas', diff --git a/src/locales/fr/queue.ts b/src/locales/fr/queue.ts index 11e40f3b..320dffb3 100644 --- a/src/locales/fr/queue.ts +++ b/src/locales/fr/queue.ts @@ -22,7 +22,9 @@ export const queue = { shuffle: 'Mélanger la file', gapless: 'Sans blanc', crossfade: 'Fondu', + autoDj: 'AutoDJ', infiniteQueue: 'File infinie', + playlist: 'Playlist', autoAdded: '— Ajouté automatiquement —', radioAdded: '— Radio —', hide: 'Masquer', diff --git a/src/locales/fr/settings.ts b/src/locales/fr/settings.ts index 30ebd834..80cfc75a 100644 --- a/src/locales/fr/settings.ts +++ b/src/locales/fr/settings.ts @@ -551,16 +551,14 @@ export const settings = { loudnessFirstPlayNote: 'À la première lecture d’un nouveau morceau, le volume peut brièvement varier pendant la mesure. La fois suivante, la mesure mise en cache prend le relais et tout reste stable. Les pistes à venir dans la file sont en général pré-analysées pendant la lecture précédente, ce cas est donc rare en pratique.', crossfade: 'Fondu enchaîné', - crossfadeDesc: 'Fondu entre les pistes', crossfadeSecs: '{{n}} s', - crossfadeTrimSilence: 'Couper le silence entre les pistes', - crossfadeTrimSilenceDesc: 'Ignorer le silence en fin de piste actuelle et en début de la suivante pour que le fondu se superpose à la musique, pas au vide. Pour un résultat fiable, activez le Cache de lecture à chaud afin que la piste suivante soit prête à temps', autoDj: 'AutoDJ', autoDjDesc: 'Sans durée fixe : AutoDJ suit l’audio réel et se superpose aux vrais fondus et intros plutôt qu’à un nombre fixe de secondes. Pour un résultat fiable, activez le Cache de lecture à chaud.', - notWithGapless: 'Non disponible quand la lecture sans blanc est active', - notWithCrossfade: 'Non disponible quand le fondu enchaîné est actif', gapless: 'Lecture sans blanc', - gaplessDesc: 'Préparer la piste suivante pour éliminer les silences entre les morceaux', + transitionsTitle: 'Transitions entre pistes', + transitionsDesc: 'Comment les pistes consécutives s’enchaînent. Un seul mode peut être actif à la fois.', + transitionOff: 'Désactivé', + queueBehaviourTitle: 'Comportement de la file', preservePlayNextOrder: "Préserver l'ordre « Lire ensuite »", preservePlayNextOrderDesc: 'Les nouveaux éléments « Lire ensuite » s\'ajoutent à la fin de la file existante au lieu de la doubler.', trackPreviewsTitle: 'Aperçus de pistes', diff --git a/src/locales/nb/queue.ts b/src/locales/nb/queue.ts index f73c3ed4..ecf9dbad 100644 --- a/src/locales/nb/queue.ts +++ b/src/locales/nb/queue.ts @@ -22,7 +22,9 @@ export const queue = { shuffle: 'Bland kø', gapless: 'Uten mellomrom', crossfade: 'Crossfade', + autoDj: 'AutoDJ', infiniteQueue: 'Uendelig kø', + playlist: 'Spilleliste', autoAdded: '- Lagt til automatisk -', radioAdded: '- Radio -', hide: 'Skjul', diff --git a/src/locales/nb/settings.ts b/src/locales/nb/settings.ts index 18985094..19582408 100644 --- a/src/locales/nb/settings.ts +++ b/src/locales/nb/settings.ts @@ -550,16 +550,14 @@ export const settings = { loudnessFirstPlayNote: 'Første avspilling av et helt nytt spor kan drive litt i volum mens målingen skjer. Neste gang brukes den lagrede målingen, og alt blir stabilt. Kommende spor i køen blir vanligvis pre-analysert mens det forrige spilles, så dette skjer sjelden i praksis.', crossfade: 'Crossfade', - crossfadeDesc: 'Tone mellom spor', crossfadeSecs: '{{n}}s', - crossfadeTrimSilence: 'Trim stillhet mellom spor', - crossfadeTrimSilenceDesc: 'Hopp over stillhet på slutten av gjeldende spor og starten på neste, slik at toningen overlapper musikk, ikke stillhet. For pålitelige resultater bør du aktivere Varm avspillingsbuffer slik at neste spor er klart i tide', autoDj: 'AutoDJ', autoDjDesc: 'Ingen fast varighet — AutoDJ følger selve lyden og overlapper ekte inn-/uttoninger i stedet for et fast antall sekunder. For pålitelige resultater bør du aktivere Varm avspillingsbuffer.', - notWithGapless: 'Ikke tilgjengelig mens Gapless er aktiv', - notWithCrossfade: 'Ikke tilgjengelig mens Crossfade er aktiv', gapless: 'Gapless avspilling', - gaplessDesc: 'Forhåndsbuffer neste spor for å eliminere mellomrom mellom sanger', + transitionsTitle: 'Overganger mellom spor', + transitionsDesc: 'Hvordan etterfølgende spor går over i hverandre. Bare én modus kan være aktiv om gangen.', + transitionOff: 'Av', + queueBehaviourTitle: 'Køoppførsel', preservePlayNextOrder: 'Behold "Spill neste"-rekkefølge', preservePlayNextOrderDesc: 'Nye "Spill neste"-elementer havner bak de eksisterende i stedet for å snike seg foran.', trackPreviewsTitle: 'Sporforhåndsvisning', diff --git a/src/locales/nl/queue.ts b/src/locales/nl/queue.ts index 7fde0880..6903e373 100644 --- a/src/locales/nl/queue.ts +++ b/src/locales/nl/queue.ts @@ -22,7 +22,9 @@ export const queue = { shuffle: 'Wachtrij shufflen', gapless: 'Naadloos', crossfade: 'Overgang', + autoDj: 'AutoDJ', infiniteQueue: 'Oneindige wachtrij', + playlist: 'Afspeellijst', autoAdded: '— Automatisch toegevoegd —', radioAdded: '— Radio —', hide: 'Verbergen', diff --git a/src/locales/nl/settings.ts b/src/locales/nl/settings.ts index 2c8860d3..6fdf3b02 100644 --- a/src/locales/nl/settings.ts +++ b/src/locales/nl/settings.ts @@ -551,16 +551,14 @@ export const settings = { loudnessFirstPlayNote: 'Bij de eerste keer afspelen van een nieuw nummer kan het volume even fluctueren terwijl er gemeten wordt. De volgende keer gebruikt de speler de opgeslagen meting en blijft alles rotsvast. Komende nummers in de wachtrij worden meestal al tijdens het vorige nummer geanalyseerd, dus dit komt in de praktijk zelden voor.', crossfade: 'Overgang', - crossfadeDesc: 'Fade tussen nummers', crossfadeSecs: '{{n}} s', - crossfadeTrimSilence: 'Stilte tussen nummers bijsnijden', - crossfadeTrimSilenceDesc: 'Sla de stilte aan het einde van het huidige nummer en aan het begin van het volgende over, zodat de overgang muziek overlapt en geen stilte. Schakel voor betrouwbare resultaten de Warme afspeelcache in zodat het volgende nummer op tijd klaarstaat', autoDj: 'AutoDJ', autoDjDesc: 'Geen vaste duur — AutoDJ volgt de werkelijke audio en overlapt echte fades en intro’s in plaats van een vast aantal seconden. Schakel voor betrouwbare resultaten de Warme afspeelcache in.', - notWithGapless: 'Niet beschikbaar als naadloos afspelen actief is', - notWithCrossfade: 'Niet beschikbaar als overgang actief is', gapless: 'Naadloos afspelen', - gaplessDesc: 'Volgend nummer vooraf bufferen om stiltes tussen nummers te elimineren', + transitionsTitle: 'Overgangen tussen nummers', + transitionsDesc: 'Hoe opeenvolgende nummers in elkaar overvloeien. Er kan maar één modus tegelijk actief zijn.', + transitionOff: 'Uit', + queueBehaviourTitle: 'Wachtrijgedrag', preservePlayNextOrder: '"Volgende afspelen"-volgorde behouden', preservePlayNextOrderDesc: 'Nieuwe "Volgende afspelen"-items komen achter bestaande te staan in plaats van ervoor.', trackPreviewsTitle: 'Track-voorvertoning', diff --git a/src/locales/ro/queue.ts b/src/locales/ro/queue.ts index 6b34e00c..0e37dc4c 100644 --- a/src/locales/ro/queue.ts +++ b/src/locales/ro/queue.ts @@ -22,7 +22,9 @@ export const queue = { shuffle: 'Amestecă coada', gapless: 'Gapless', crossfade: 'Crossfade', + autoDj: 'AutoDJ', infiniteQueue: 'Coadă infinită', + playlist: 'Listă', autoAdded: '— Adăugat automat—', radioAdded: '— Radio —', hide: 'Ascunde', diff --git a/src/locales/ro/settings.ts b/src/locales/ro/settings.ts index 9a3d2bf2..ee3b585d 100644 --- a/src/locales/ro/settings.ts +++ b/src/locales/ro/settings.ts @@ -566,16 +566,14 @@ export const settings = { loudnessFirstPlayNote: 'Prima redate a unei piese noi își poate schimba brusc volumul cât este măsurată. Următoarea redare folosește măsurătoarea stocată și este stabilă. Piesele următoare din coadă sunt de obicei pre-analizate în timpul piesei anterioare, deci acest fenomen se întâmplă rar în practică.', crossfade: 'Crossfade', - crossfadeDesc: 'Estompează între piese', crossfadeSecs: '{{n}} s', - crossfadeTrimSilence: 'Elimină liniștea dintre piese', - crossfadeTrimSilenceDesc: 'Sare peste liniștea de la finalul piesei curente și de la începutul celei următoare, astfel încât estomparea să se suprapună peste muzică, nu peste gol. Pentru rezultate fiabile, activează Cache-ul hot playback ca piesa următoare să fie gata la timp', autoDj: 'AutoDJ', autoDjDesc: 'Fără durată fixă — AutoDJ urmează sunetul real și se suprapune peste estompările și introducerile reale, în loc de un număr fix de secunde. Pentru rezultate fiabile, activează Cache-ul hot playback.', - notWithGapless: 'Nu este valabil cât Gapless este activ', - notWithCrossfade: 'Nu este valabil cât Crossfade este activ', gapless: 'Playback Gapless', - gaplessDesc: 'Pre-încarcă următoarea piesă pentru a elimina spațiile dintre piese', + transitionsTitle: 'Tranziții între piese', + transitionsDesc: 'Cum se îmbină piesele consecutive. Doar un mod poate fi activ la un moment dat.', + transitionOff: 'Dezactivat', + queueBehaviourTitle: 'Comportamentul cozii', preservePlayNextOrder: 'Prezervă ordinea "Redă următoarea"', preservePlayNextOrderDesc: 'Elementele Redă Următoarea noi adăugate sunt puse după cele adăugate mai devreme în loc să sară în față.', trackPreviewsTitle: 'Previzualizări Piese', diff --git a/src/locales/ru/queue.ts b/src/locales/ru/queue.ts index 8be3c273..228b7b9a 100644 --- a/src/locales/ru/queue.ts +++ b/src/locales/ru/queue.ts @@ -22,7 +22,9 @@ export const queue = { shuffle: 'Перемешать', gapless: 'Без пауз', crossfade: 'Кроссфейд', + autoDj: 'AutoDJ', infiniteQueue: 'Бесконечная очередь', + playlist: 'Плейлист', autoAdded: '— Добавлено автоматически —', radioAdded: '— Радио —', hide: 'Скрыть', diff --git a/src/locales/ru/settings.ts b/src/locales/ru/settings.ts index 00f4c905..717a0a71 100644 --- a/src/locales/ru/settings.ts +++ b/src/locales/ru/settings.ts @@ -651,16 +651,14 @@ export const settings = { loudnessFirstPlayNote: 'При первом прослушивании нового трека громкость может ненадолго колебаться, пока идёт измерение. Со второго раза применяется уже сохранённое значение и всё стабильно. Следующие треки в очереди обычно анализируются во время предыдущей композиции, поэтому на практике это случается редко.', crossfade: 'Кроссфейд', - crossfadeDesc: 'Плавный переход между треками', crossfadeSecs: '{{n}} с', - crossfadeTrimSilence: 'Обрезать тишину между треками', - crossfadeTrimSilenceDesc: 'Пропускать тишину в конце текущего трека и в начале следующего, чтобы переход накладывался на музыку, а не на пустоту. Для надёжной работы крайне желательно включить «Горячий кэш воспроизведения», чтобы следующий трек был готов вовремя', autoDj: 'AutoDJ', autoDjDesc: 'Без фиксированной длительности — AutoDJ подстраивается под само звучание, накладываясь на реальные затухания и вступления, а не на заданное число секунд. Для надёжной работы включите «Горячий кэш воспроизведения».', - notWithGapless: 'Недоступно при включённом режиме без пауз', - notWithCrossfade: 'Недоступно при включённом кроссфейде', gapless: 'Без пауз между треками', - gaplessDesc: 'Заранее подгружать следующий трек, чтобы не было тишины', + transitionsTitle: 'Переходы между треками', + transitionsDesc: 'Как соединяются идущие подряд треки. Одновременно может быть активен только один режим.', + transitionOff: 'Выкл.', + queueBehaviourTitle: 'Поведение очереди', preservePlayNextOrder: 'Сохранять порядок «Играть следующим»', preservePlayNextOrderDesc: 'Новые элементы «Играть следующим» становятся в конец очереди, а не лезут вперёд.', trackPreviewsTitle: 'Превью треков', diff --git a/src/locales/zh/queue.ts b/src/locales/zh/queue.ts index a6aea2f5..d22022ab 100644 --- a/src/locales/zh/queue.ts +++ b/src/locales/zh/queue.ts @@ -22,7 +22,9 @@ export const queue = { shuffle: '随机打乱队列', gapless: '无缝播放', crossfade: '交叉淡入淡出', + autoDj: 'AutoDJ', infiniteQueue: '无限队列', + playlist: '播放列表', autoAdded: '— 自动添加 —', radioAdded: '— 收音机 —', hide: '隐藏', diff --git a/src/locales/zh/settings.ts b/src/locales/zh/settings.ts index 3a56b78b..27a3d461 100644 --- a/src/locales/zh/settings.ts +++ b/src/locales/zh/settings.ts @@ -550,16 +550,14 @@ export const settings = { loudnessFirstPlayNote: '首次播放新曲目时，音量可能在测量过程中略有波动。下一次播放将使用缓存的测量结果，保持稳定。队列中即将播放的曲目通常在上一首播放期间已完成预分析，所以这种情况在实际使用中很少出现。', crossfade: '交叉淡入淡出', - crossfadeDesc: '曲目间淡入淡出', crossfadeSecs: '{{n}} 秒', - crossfadeTrimSilence: '修剪曲目间的静音', - crossfadeTrimSilenceDesc: '跳过当前曲目结尾和下一曲目开头的静音，让淡变叠加在音乐而非空白上。为获得稳定效果，强烈建议启用「热播放缓存」，以便下一曲目及时就绪', autoDj: 'AutoDJ', autoDjDesc: '没有固定时长——AutoDJ 跟随实际音频，叠加在真实的淡入淡出上，而不是固定的秒数。为获得稳定效果，请启用「热播放缓存」。', - notWithGapless: '无缝播放开启时不可用', - notWithCrossfade: '交叉淡入淡出开启时不可用', gapless: '无缝播放', - gaplessDesc: '预缓冲下一首曲目以消除歌曲间的间隙', + transitionsTitle: '曲目间过渡', + transitionsDesc: '连续曲目之间如何衔接。同一时间只能启用一种模式。', + transitionOff: '关闭', + queueBehaviourTitle: '队列行为', preservePlayNextOrder: '保留"下一首播放"顺序', preservePlayNextOrderDesc: '新添加的"下一首播放"项目排在现有项目之后，而不是插到前面。', trackPreviewsTitle: '曲目预览', diff --git a/src/store/queueToolbarStore.test.ts b/src/store/queueToolbarStore.test.ts new file mode 100644 index 00000000..64aef5b7 --- /dev/null +++ b/src/store/queueToolbarStore.test.ts @@ -0,0 +1,87 @@ +import { describe, expect, it } from 'vitest'; +import { + DEFAULT_QUEUE_TOOLBAR_BUTTONS, + migrateQueueToolbarButtons, + type QueueToolbarButtonConfig, +} from './queueToolbarStore'; + +const ids = (b: QueueToolbarButtonConfig[]) => b.map(x => x.id); +const vis = (b: QueueToolbarButtonConfig[], id: string) => b.find(x => x.id === id)?.visible; + +describe('migrateQueueToolbarButtons', () => { + it('passes the current default through unchanged', () => { + expect(migrateQueueToolbarButtons(DEFAULT_QUEUE_TOOLBAR_BUTTONS)).toEqual(DEFAULT_QUEUE_TOOLBAR_BUTTONS); + }); + + it('collapses legacy save + load into a single playlist button at the earlier position', () => { + const legacy = [ + { id: 'shuffle', visible: true }, + { id: 'save', visible: true }, + { id: 'load', visible: true }, + { id: 'share', visible: true }, + { id: 'clear', visible: true }, + { id: 'separator', visible: true }, + { id: 'gapless', visible: true }, + { id: 'crossfade', visible: true }, + { id: 'infinite', visible: true }, + ]; + const out = migrateQueueToolbarButtons(legacy); + expect(ids(out)).toEqual([ + 'shuffle', 'playlist', 'share', 'clear', 'separator', 'gapless', 'crossfade', 'autodj', 'infinite', + ]); + }); + + it('keeps playlist visible if either legacy save or load was visible', () => { + const out = migrateQueueToolbarButtons([ + { id: 'save', visible: false }, + { id: 'load', visible: true }, + ]); + expect(vis(out, 'playlist')).toBe(true); + + const hidden = migrateQueueToolbarButtons([ + { id: 'save', visible: false }, + { id: 'load', visible: false }, + ]); + expect(vis(hidden, 'playlist')).toBe(false); + }); + + it('inserts autodj right after crossfade and inherits its visibility', () => { + const out = migrateQueueToolbarButtons([ + { id: 'crossfade', visible: false }, + { id: 'infinite', visible: true }, + ]); + const i = ids(out); + expect(i.indexOf('autodj')).toBe(i.indexOf('crossfade') + 1); + expect(vis(out, 'autodj')).toBe(false); + }); + + it('preserves a customised order', () => { + const out = migrateQueueToolbarButtons([ + { id: 'crossfade', visible: true }, + { id: 'shuffle', visible: true }, + { id: 'playlist', visible: true }, + ]); + // autodj follows crossfade, leading items keep their order, missing defaults appended. + expect(ids(out).slice(0, 4)).toEqual(['crossfade', 'autodj', 'shuffle', 'playlist']); + // every default id is present exactly once + for (const d of DEFAULT_QUEUE_TOOLBAR_BUTTONS) { + expect(ids(out).filter(x => x === d.id)).toHaveLength(1); + } + }); + + it('drops corrupt entries and tolerates non-array input', () => { + const out = migrateQueueToolbarButtons([ + null, + { id: 'shuffle', visible: true }, + { id: 123, visible: true }, + { id: 'bogus', visible: true }, + { visible: true }, + ]); + expect(ids(out)).toContain('shuffle'); + expect(ids(out)).not.toContain('bogus'); + // unknown/corrupt gone, defaults filled in + expect(ids(out).sort()).toEqual(DEFAULT_QUEUE_TOOLBAR_BUTTONS.map(b => b.id).sort()); + + expect(migrateQueueToolbarButtons(undefined)).toEqual(DEFAULT_QUEUE_TOOLBAR_BUTTONS); + }); +}); diff --git a/src/store/queueToolbarStore.ts b/src/store/queueToolbarStore.ts index 224aa3fc..1f03364e 100644 --- a/src/store/queueToolbarStore.ts +++ b/src/store/queueToolbarStore.ts @@ -3,13 +3,13 @@ import { persist } from 'zustand/middleware'; export type QueueToolbarButtonId = | 'shuffle' - | 'save' - | 'load' + | 'playlist' | 'share' | 'clear' | 'separator' | 'gapless' | 'crossfade' + | 'autodj' | 'infinite'; export interface QueueToolbarButtonConfig { @@ -18,21 +18,81 @@ export interface QueueToolbarButtonConfig { } /** - * Default order and visibility for queue toolbar buttons. - * Matches the historical layout in QueuePanel.tsx. + * Default order and visibility for queue toolbar buttons. `playlist` is a + * submenu hosting save + load; `crossfade` and `autodj` sit next to each other + * as the two crossfade-style transition modes. */ export const DEFAULT_QUEUE_TOOLBAR_BUTTONS: QueueToolbarButtonConfig[] = [ { id: 'shuffle', visible: true }, - { id: 'save', visible: true }, - { id: 'load', visible: true }, + { id: 'playlist', visible: true }, { id: 'share', visible: true }, { id: 'clear', visible: true }, { id: 'separator', visible: true }, { id: 'gapless', visible: true }, { id: 'crossfade', visible: true }, + { id: 'autodj', visible: true }, { id: 'infinite', visible: true }, ]; +/** Pre-split ids that still live in persisted configs from older versions. */ +type LegacyEntry = { id: QueueToolbarButtonId | 'save' | 'load'; visible: boolean }; + +/** + * Bring a persisted button array up to the current id set, preserving the + * user's order and visibility: + * 1. drop corrupt entries, + * 2. collapse legacy `save` + `load` into a single `playlist` button at the + * earlier of the two positions (visible if either was visible), + * 3. drop anything not in the current id set, + * 4. insert the new `autodj` button right after `crossfade`, and + * 5. append any still-missing defaults. + */ +export function migrateQueueToolbarButtons(raw: unknown): QueueToolbarButtonConfig[] { + const arr = Array.isArray(raw) ? raw : []; + const cleaned = arr.filter( + (b): b is LegacyEntry => + b != null && typeof b.id === 'string' && typeof (b as LegacyEntry).visible === 'boolean', + ); + + // Legacy save + load -> single playlist button. + const legacySaveLoad = cleaned.filter(b => b.id === 'save' || b.id === 'load'); + const alreadyHasPlaylist = cleaned.some(b => b.id === 'playlist'); + let collapsed: LegacyEntry[] = cleaned; + if (legacySaveLoad.length > 0 && !alreadyHasPlaylist) { + const playlistVisible = legacySaveLoad.some(b => b.visible); + let inserted = false; + collapsed = []; + for (const b of cleaned) { + if (b.id === 'save' || b.id === 'load') { + if (!inserted) { collapsed.push({ id: 'playlist', visible: playlistVisible }); inserted = true; } + continue; + } + collapsed.push(b); + } + } + + // Keep only current ids (also drops any leftover save/load). + const knownIds = new Set(DEFAULT_QUEUE_TOOLBAR_BUTTONS.map(b => b.id)); + let safe = collapsed.filter( + (b): b is QueueToolbarButtonConfig => knownIds.has(b.id as QueueToolbarButtonId), + ); + + // Insert the new autodj button next to an existing crossfade, inheriting its + // visibility (the upgrade case). When crossfade isn't present yet (fresh or + // corrupt input) we leave autodj to the default-fill step below so it lands + // in its canonical position instead of at the front. + const cfIdx = safe.findIndex(b => b.id === 'crossfade'); + if (cfIdx >= 0 && !safe.some(b => b.id === 'autodj')) { + const autodj: QueueToolbarButtonConfig = { id: 'autodj', visible: safe[cfIdx].visible }; + safe = [...safe.slice(0, cfIdx + 1), autodj, ...safe.slice(cfIdx + 1)]; + } + + // Append any default still missing (fresh install, or pruned ids). + const seen = new Set(safe.map(b => b.id)); + const missing = DEFAULT_QUEUE_TOOLBAR_BUTTONS.filter(b => !seen.has(b.id)); + return missing.length > 0 ? [...safe, ...missing] : safe; +} + interface QueueToolbarStore { buttons: QueueToolbarButtonConfig[]; setButtons: (buttons: QueueToolbarButtonConfig[]) => void; @@ -57,13 +117,7 @@ export const useQueueToolbarStore = create()( name: 'psysonic_queue_toolbar', onRehydrateStorage: () => (state) => { if (!state) return; - // Sanitize: remove null/corrupt entries - const knownIds = new Set(DEFAULT_QUEUE_TOOLBAR_BUTTONS.map(b => b.id)); - const safe = (state.buttons ?? []) - .filter((b): b is QueueToolbarButtonConfig => b != null && typeof b.id === 'string' && knownIds.has(b.id as QueueToolbarButtonId)); - const seen = new Set(safe.map(b => b.id)); - const missing = DEFAULT_QUEUE_TOOLBAR_BUTTONS.filter(b => !seen.has(b.id)); - state.buttons = missing.length > 0 ? [...safe, ...missing] : safe; + state.buttons = migrateQueueToolbarButtons(state.buttons); }, } ) diff --git a/src/styles/components/mini-player-window.css b/src/styles/components/mini-player-window.css index a8d64f0a..4b9cc382 100644 --- a/src/styles/components/mini-player-window.css +++ b/src/styles/components/mini-player-window.css @@ -240,39 +240,6 @@ cursor: pointer; } -.mini-player__crossfade-modes { - display: flex; - gap: 4px; -} - -.mini-player__crossfade-mode { - flex: 1 1 0; - min-width: 0; - padding: 5px 6px; - font-size: 11px; - font-weight: 600; - border: 1px solid var(--border-subtle); - border-radius: 6px; - background: transparent; - color: var(--text-secondary); - cursor: pointer; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - transition: background 0.12s ease, color 0.12s ease, border-color 0.12s ease; -} - -.mini-player__crossfade-mode:hover { - border-color: color-mix(in srgb, var(--accent) 40%, var(--border-subtle)); - color: var(--text-primary); -} - -.mini-player__crossfade-mode.active { - background: var(--accent); - border-color: var(--accent); - color: var(--bg-app); -} - .mini-player__volume-pct { font-size: 10px; color: var(--text-muted); diff --git a/src/styles/components/settings.css b/src/styles/components/settings.css index 89ded270..8d4cc137 100644 --- a/src/styles/components/settings.css +++ b/src/styles/components/settings.css @@ -544,6 +544,35 @@ span.settings-server-use-active-slot { padding: var(--space-3); } +/* Boxed sub-section panel inside a settings card — sets related controls + apart as a distinct block (e.g. Normalization / Track transitions / + Queue behaviour in the Playback card). */ +.settings-group { + background: var(--bg-app); + border: 1px solid var(--border-subtle); + border-radius: var(--radius-md); + padding: var(--space-4); +} + +.settings-group + .settings-group { + margin-top: var(--space-3); +} + +.settings-group-title { + font-size: 11px; + font-weight: 700; + letter-spacing: 0.06em; + text-transform: uppercase; + color: var(--accent); + margin-bottom: 6px; +} + +.settings-group-desc { + font-size: 12px; + color: var(--text-muted); + margin-bottom: 0.85rem; +} + .settings-card.user-row { transition: background 120ms ease, border-color 120ms ease; } diff --git a/src/styles/layout/queue-panel.css b/src/styles/layout/queue-panel.css index d6c5c7e5..fd4d21ac 100644 --- a/src/styles/layout/queue-panel.css +++ b/src/styles/layout/queue-panel.css @@ -162,6 +162,46 @@ color: var(--bg-app); } +/* Compact dropdown menu reusing the .crossfade-popover box (the playlist + save/load submenu). Items stack vertically as left-aligned rows. */ +.queue-menu { + width: 150px; + padding: 6px; + gap: 2px; + /* Open rightward so the menu stays inside the queue panel — the playlist + button sits on the left, where the inherited right:0 would push it out + under the main container. */ + left: 0; + right: auto; +} + +.queue-menu-item { + display: flex; + align-items: center; + gap: 8px; + width: 100%; + padding: 7px 9px; + font-size: 12px; + font-weight: 600; + border: none; + border-radius: var(--radius-sm); + background: transparent; + color: var(--text-secondary); + cursor: pointer; + text-align: left; + transition: background 0.12s ease, color 0.12s ease; +} + +.queue-menu-item:hover:not(:disabled) { + background: var(--bg-hover); + color: var(--text-primary); +} + +.queue-menu-item:disabled { + opacity: 0.5; + cursor: default; +} + .queue-toolbar-sep { width: 1px; height: 18px; diff --git a/src/utils/miniPlayerBridge.ts b/src/utils/miniPlayerBridge.ts index 3ccce325..a80d6e2f 100644 --- a/src/utils/miniPlayerBridge.ts +++ b/src/utils/miniPlayerBridge.ts @@ -2,6 +2,7 @@ import { getCurrentWindow } from '@tauri-apps/api/window'; import { listen, emitTo } from '@tauri-apps/api/event'; import { usePlayerStore } from '../store/playerStore'; import { useAuthStore } from '../store/authStore'; +import { setTransitionMode, type TransitionMode } from './playback/playbackTransition'; import { resolveQueueTrack } from './library/queueTrackView'; import type { SubsonicOpenArtistRef } from '../api/subsonicTypes'; @@ -247,18 +248,10 @@ export function initMiniPlayerBridgeOnMain(): () => void { // Gapless ↔ Crossfade are mutually exclusive. Bridge handles the exclusion // so the mini doesn't need to know about both states to act. - const gaplessUnlisten = listen<{ value: boolean }>('mini:set-gapless', (e) => { - const v = !!e.payload?.value; - const a = useAuthStore.getState(); - if (v) a.setCrossfadeEnabled(false); - a.setGaplessEnabled(v); - }); - - const crossfadeUnlisten = listen<{ value: boolean }>('mini:set-crossfade', (e) => { - const v = !!e.payload?.value; - const a = useAuthStore.getState(); - if (v) a.setGaplessEnabled(false); - a.setCrossfadeEnabled(v); + const transitionModeUnlisten = listen<{ value: string }>('mini:set-transition-mode', (e) => { + const v = e.payload?.value; + const modes: TransitionMode[] = ['none', 'gapless', 'crossfade', 'autodj']; + if (modes.includes(v as TransitionMode)) setTransitionMode(v as TransitionMode); }); const crossfadeSecsUnlisten = listen<{ value: number }>('mini:set-crossfade-secs', (e) => { @@ -267,10 +260,6 @@ export function initMiniPlayerBridgeOnMain(): () => void { useAuthStore.getState().setCrossfadeSecs(Math.max(0.1, Math.min(10, v))); }); - const crossfadeTrimSilenceUnlisten = listen<{ value: boolean }>('mini:set-crossfade-trim-silence', (e) => { - useAuthStore.getState().setCrossfadeTrimSilence(!!e.payload?.value); - }); - const infiniteQueueUnlisten = listen<{ value: boolean }>('mini:set-infinite-queue', (e) => { const v = !!e.payload?.value; useAuthStore.getState().setInfiniteQueueEnabled(v); @@ -300,10 +289,8 @@ export function initMiniPlayerBridgeOnMain(): () => void { shuffleUnlisten.then(fn => fn()).catch(() => {}); undoQueueUnlisten.then(fn => fn()).catch(() => {}); redoQueueUnlisten.then(fn => fn()).catch(() => {}); - gaplessUnlisten.then(fn => fn()).catch(() => {}); - crossfadeUnlisten.then(fn => fn()).catch(() => {}); + transitionModeUnlisten.then(fn => fn()).catch(() => {}); crossfadeSecsUnlisten.then(fn => fn()).catch(() => {}); - crossfadeTrimSilenceUnlisten.then(fn => fn()).catch(() => {}); infiniteQueueUnlisten.then(fn => fn()).catch(() => {}); songInfoUnlisten.then(fn => fn()).catch(() => {}); }; diff --git a/src/utils/playback/playbackTransition.test.ts b/src/utils/playback/playbackTransition.test.ts new file mode 100644 index 00000000..b9a7a7a9 --- /dev/null +++ b/src/utils/playback/playbackTransition.test.ts @@ -0,0 +1,85 @@ +import { describe, expect, it, beforeEach } from 'vitest'; +import { useAuthStore } from '../../store/authStore'; +import { + getTransitionMode, + transitionFlagsFor, + setTransitionMode, + type TransitionMode, +} from './playbackTransition'; + +const MODES: TransitionMode[] = ['none', 'gapless', 'crossfade', 'autodj']; + +describe('getTransitionMode', () => { + it('maps each flag combination to its mode', () => { + expect(getTransitionMode({ gaplessEnabled: false, crossfadeEnabled: false, crossfadeTrimSilence: false })).toBe('none'); + expect(getTransitionMode({ gaplessEnabled: true, crossfadeEnabled: false, crossfadeTrimSilence: false })).toBe('gapless'); + expect(getTransitionMode({ gaplessEnabled: false, crossfadeEnabled: true, crossfadeTrimSilence: false })).toBe('crossfade'); + expect(getTransitionMode({ gaplessEnabled: false, crossfadeEnabled: true, crossfadeTrimSilence: true })).toBe('autodj'); + }); + + it('treats trim-silence as AutoDJ only while crossfade is on', () => { + // Stale trim flag with crossfade off is still "none", not AutoDJ. + expect(getTransitionMode({ gaplessEnabled: false, crossfadeEnabled: false, crossfadeTrimSilence: true })).toBe('none'); + }); + + it('is total — gapless wins if both gapless and crossfade are set', () => { + expect(getTransitionMode({ gaplessEnabled: true, crossfadeEnabled: true, crossfadeTrimSilence: true })).toBe('gapless'); + }); +}); + +describe('transitionFlagsFor', () => { + it('round-trips through getTransitionMode for every mode', () => { + for (const mode of MODES) { + expect(getTransitionMode(transitionFlagsFor(mode))).toBe(mode); + } + }); + + it('never sets more than one independent behaviour at once', () => { + for (const mode of MODES) { + const f = transitionFlagsFor(mode); + // crossfade and gapless are the two independent toggles; trim only rides on crossfade + expect(f.gaplessEnabled && f.crossfadeEnabled).toBe(false); + if (f.crossfadeTrimSilence) expect(f.crossfadeEnabled).toBe(true); + } + }); +}); + +describe('setTransitionMode', () => { + beforeEach(() => { + setTransitionMode('none'); + }); + + it('applies the flags atomically and enforces exclusivity', () => { + setTransitionMode('crossfade'); + let s = useAuthStore.getState(); + expect(s.crossfadeEnabled).toBe(true); + expect(s.crossfadeTrimSilence).toBe(false); + expect(s.gaplessEnabled).toBe(false); + + setTransitionMode('autodj'); + s = useAuthStore.getState(); + expect(s.crossfadeEnabled).toBe(true); + expect(s.crossfadeTrimSilence).toBe(true); + expect(s.gaplessEnabled).toBe(false); + + setTransitionMode('gapless'); + s = useAuthStore.getState(); + expect(s.gaplessEnabled).toBe(true); + expect(s.crossfadeEnabled).toBe(false); + expect(s.crossfadeTrimSilence).toBe(false); + + setTransitionMode('none'); + s = useAuthStore.getState(); + expect(s.gaplessEnabled).toBe(false); + expect(s.crossfadeEnabled).toBe(false); + expect(s.crossfadeTrimSilence).toBe(false); + }); + + it('preserves crossfadeSecs when switching between crossfade and autodj', () => { + useAuthStore.getState().setCrossfadeSecs(7); + setTransitionMode('crossfade'); + setTransitionMode('autodj'); + setTransitionMode('crossfade'); + expect(useAuthStore.getState().crossfadeSecs).toBe(7); + }); +}); diff --git a/src/utils/playback/playbackTransition.ts b/src/utils/playback/playbackTransition.ts new file mode 100644 index 00000000..62b09d51 --- /dev/null +++ b/src/utils/playback/playbackTransition.ts @@ -0,0 +1,60 @@ +import { useAuthStore } from '../../store/authStore'; + +/** + * The one active track-transition behaviour. These are mutually exclusive — + * only one can be on at a time. + * + * AutoDJ has no dedicated persisted flag: it is crossfade with content-driven + * silence trimming (`crossfadeTrimSilence`). Keeping it encoded on the existing + * flags avoids a state migration and leaves the audio engine — which reads the + * three flags below directly — untouched. + */ +export type TransitionMode = 'none' | 'gapless' | 'crossfade' | 'autodj'; + +/** The persisted flags that together encode the active transition mode. */ +export interface TransitionFlags { + gaplessEnabled: boolean; + crossfadeEnabled: boolean; + crossfadeTrimSilence: boolean; +} + +/** + * Derive the single active mode from the persisted flags. Total by design — + * gapless wins if both gapless and crossfade are somehow set (the UI never + * produces that, but the getter must not return `undefined`). + */ +export function getTransitionMode(flags: TransitionFlags): TransitionMode { + if (flags.gaplessEnabled) return 'gapless'; + if (flags.crossfadeEnabled) return flags.crossfadeTrimSilence ? 'autodj' : 'crossfade'; + return 'none'; +} + +/** + * Flag combination for a mode — the single source of truth for "only one + * active". `crossfadeSecs` is intentionally not touched here so switching + * between classic crossfade and AutoDJ (and back) preserves the user's chosen + * duration. + */ +export function transitionFlagsFor(mode: TransitionMode): TransitionFlags { + switch (mode) { + case 'gapless': + return { gaplessEnabled: true, crossfadeEnabled: false, crossfadeTrimSilence: false }; + case 'crossfade': + return { gaplessEnabled: false, crossfadeEnabled: true, crossfadeTrimSilence: false }; + case 'autodj': + return { gaplessEnabled: false, crossfadeEnabled: true, crossfadeTrimSilence: true }; + case 'none': + default: + return { gaplessEnabled: false, crossfadeEnabled: false, crossfadeTrimSilence: false }; + } +} + +/** + * Apply a transition mode atomically, enforcing exclusivity in one place. + * Replaces the scattered `setGaplessEnabled(false)` / `setCrossfadeEnabled(...)` + * / `setCrossfadeTrimSilence(...)` combinations across the queue toolbar, mini + * player and settings. + */ +export function setTransitionMode(mode: TransitionMode): void { + useAuthStore.setState(transitionFlagsFor(mode)); +}