refactor(lib): fold utils/audio + autodj-overlap into lib/audio (audio-transition infra; drains utils/playback)

src/features/orbit/utils/transitions.ts

@@ -3,7 +3,7 @@ import type { OrbitTransitionSettings } from '@/features/orbit/api/orbit';
 import {
   sanitizeAutodjOverlapCapMode,
   sanitizeAutodjOverlapCapSec,
-} from '@/utils/playback/autodjOverlapCap';
+} from '@/lib/audio/autodjOverlapCap';
 
 /**
  * Bridge between the local playback-transition settings (in `authStore`) and

src/features/playback/store/audioEventHandlers.ts

@@ -28,7 +28,7 @@ import {
 } from '@/features/playback/utils/playback/playbackServer';
 import { resolvePlaybackUrl } from '@/features/playback/utils/playback/resolvePlaybackUrl';
 import { resolveReplayGainDb } from '@/features/playback/utils/audio/resolveReplayGainDb';
-import { audioPlayHiResBlendArgs } from '@/utils/audio/hiResCrossfadeResample';
+import { audioPlayHiResBlendArgs } from '@/lib/audio/hiResCrossfadeResample';
 import { showToast } from '@/utils/ui/toast';
 import { useAuthStore } from '@/store/authStore';
 import { getPlayGeneration, setIsAudioPaused } from '@/features/playback/store/engineState';
@@ -89,7 +89,7 @@ import {
 } from '@/features/playback/store/seekTargetState';
 import { refreshWaveformForTrack } from '@/features/playback/store/waveformRefresh';
 import { analyzeBoundary, computeWaveformSilence } from '@/lib/waveform/waveformSilence';
-import { autodjMaxOverlapCapSec } from '@/utils/playback/autodjOverlapCap';
+import { autodjMaxOverlapCapSec } from '@/lib/audio/autodjOverlapCap';
 import {
   autodjJsTriggerAtSec,
   clampCrossfadeSecs,

src/features/playback/store/audioListenerSetup/authSyncListener.ts

@@ -1,5 +1,5 @@
 import { invoke } from '@tauri-apps/api/core';
-import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/utils/audio/loudnessPreAnalysisSlider';
+import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/lib/audio/loudnessPreAnalysisSlider';
 import { useAuthStore } from '@/store/authStore';
 import { onAnalysisStorageChanged } from '@/store/analysisSync';
 import { emitNormalizationDebug } from '@/features/playback/store/normalizationDebug';

src/features/playback/store/audioListenerSetup/initialAudioSync.ts

@@ -1,5 +1,5 @@
 import { invoke } from '@tauri-apps/api/core';
-import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/utils/audio/loudnessPreAnalysisSlider';
+import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/lib/audio/loudnessPreAnalysisSlider';
 import { useAuthStore } from '@/store/authStore';
 import { emitNormalizationDebug } from '@/features/playback/store/normalizationDebug';
 import { invokeAudioSetNormalizationDeduped } from '@/features/playback/store/normalizationIpcDedupe';

src/features/playback/store/crossfadePreload.ts

@@ -1,6 +1,6 @@
 import { invoke } from '@tauri-apps/api/core';
 import { useAuthStore } from '@/store/authStore';
-import { autodjMaxOverlapCapSec } from '@/utils/playback/autodjOverlapCap';
+import { autodjMaxOverlapCapSec } from '@/lib/audio/autodjOverlapCap';
 import { computeWaveformSilence, planCrossfadeTransition } from '@/lib/waveform/waveformSilence';
 import { findLocalPlaybackUrl } from '@/store/localPlaybackResolve';
 import { playbackCacheKeyForRef } from '@/features/playback/utils/playback/playbackServer';

src/features/playback/store/engineLoadTrackAtPosition.ts

@@ -7,7 +7,7 @@ import {
 } from '@/features/playback/utils/playback/playbackServer';
 import { resolvePlaybackUrl } from '@/features/playback/utils/playback/resolvePlaybackUrl';
 import { resolveReplayGainDb } from '@/features/playback/utils/audio/resolveReplayGainDb';
-import { audioPlayHiResBlendArgs } from '@/utils/audio/hiResCrossfadeResample';
+import { audioPlayHiResBlendArgs } from '@/lib/audio/hiResCrossfadeResample';
 import { useAuthStore } from '@/store/authStore';
 import { getPlayGeneration, setIsAudioPaused } from '@/features/playback/store/engineState';
 import { touchHotCacheOnPlayback } from '@/features/playback/store/hotCacheTouch';

src/features/playback/store/normalizationIpcDedupe.test.ts

@@ -17,7 +17,7 @@ const { authState, invokeMock } = vi.hoisted(() => ({
 
 vi.mock('@tauri-apps/api/core', () => ({ invoke: invokeMock }));
 vi.mock('@/store/authStore', () => ({ useAuthStore: { getState: () => authState } }));
-vi.mock('@/utils/audio/loudnessPreAnalysisSlider', () => ({
+vi.mock('@/lib/audio/loudnessPreAnalysisSlider', () => ({
   effectiveLoudnessPreAnalysisAttenuationDb: (attenuation: number) => attenuation,
 }));
 

src/features/playback/store/normalizationIpcDedupe.ts

@@ -1,6 +1,6 @@
 import { invoke } from '@tauri-apps/api/core';
 import { useAuthStore } from '@/store/authStore';
-import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/utils/audio/loudnessPreAnalysisSlider';
+import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/lib/audio/loudnessPreAnalysisSlider';
 
 /**
  * Two IPC entry points to the Rust normalization pipeline that get hammered

src/features/playback/store/playTrackAction.ts

@@ -33,7 +33,7 @@ import {
 } from '@/store/localPlaybackResolve';
 import { resolvePlaybackUrl } from '@/features/playback/utils/playback/resolvePlaybackUrl';
 import { resolveReplayGainDb } from '@/features/playback/utils/audio/resolveReplayGainDb';
-import { audioPlayHiResBlendArgs } from '@/utils/audio/hiResCrossfadeResample';
+import { audioPlayHiResBlendArgs } from '@/lib/audio/hiResCrossfadeResample';
 import { useAuthStore } from '@/store/authStore';
 import { consumeCrossfadeDynamicOverlap, getCrossfadeTransition, peekArmedCrossfadeDynamicOverlap } from '@/features/playback/store/crossfadeTrimCache';
 import {

src/features/playback/store/resumeAction.ts

@@ -8,7 +8,7 @@ import {
 } from '@/features/playback/utils/playback/playbackServer';
 import { resolvePlaybackUrl } from '@/features/playback/utils/playback/resolvePlaybackUrl';
 import { resolveReplayGainDb } from '@/features/playback/utils/audio/resolveReplayGainDb';
-import { audioPlayHiResBlendArgs } from '@/utils/audio/hiResCrossfadeResample';
+import { audioPlayHiResBlendArgs } from '@/lib/audio/hiResCrossfadeResample';
 import { songToTrack } from '@/lib/media/songToTrack';
 import { useAuthStore } from '@/store/authStore';
 import {

src/features/playback/store/updateReplayGainAction.ts

@@ -1,4 +1,4 @@
-import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/utils/audio/loudnessPreAnalysisSlider';
+import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/lib/audio/loudnessPreAnalysisSlider';
 import { loudnessGainPlaceholderUntilCacheDb } from '@/features/playback/utils/audio/loudnessPlaceholder';
 import { resolveReplayGainDb } from '@/features/playback/utils/audio/resolveReplayGainDb';
 import { useAuthStore } from '@/store/authStore';

src/features/playback/utils/playback/autodjManualBlend.ts

@@ -1,5 +1,5 @@
 import { useAuthStore } from '@/store/authStore';
-import { autodjMaxOverlapCapSec } from '@/utils/playback/autodjOverlapCap';
+import { autodjMaxOverlapCapSec } from '@/lib/audio/autodjOverlapCap';
 import {
   analyzeBoundary,
   planCrossfadeTransition,

src/features/queue/components/QueueCurrentTrack.tsx

@@ -9,7 +9,7 @@ import {
   renderStars,
 } from '@/utils/componentHelpers/queuePanelHelpers';
 import { loudnessGainPlaceholderUntilCacheDb } from '@/features/playback/utils/audio/loudnessPlaceholder';
-import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/utils/audio/loudnessPreAnalysisSlider';
+import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/lib/audio/loudnessPreAnalysisSlider';
 import { formatQueueBpmTech, formatQueueMoodLabels } from '@/lib/library/trackEnrichment';
 import { useQueueTrackEnrichment } from '@/features/queue/hooks/useQueueTrackEnrichment';
 import { QueueLufsTargetMenu } from '@/features/queue/components/QueueLufsTargetMenu';

src/features/settings/components/AudioTab.tsx

@@ -6,7 +6,7 @@ import { Equalizer } from '@/features/equalizer';
 import SettingsSubSection from '@/features/settings/components/SettingsSubSection';
 import { SettingsGroup } from '@/features/settings/components/SettingsGroup';
 import { SettingsToggle } from '@/features/settings/components/SettingsToggle';
-import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/utils/audio/loudnessPreAnalysisSlider';
+import { effectiveLoudnessPreAnalysisAttenuationDb } from '@/lib/audio/loudnessPreAnalysisSlider';
 import { useAudioDevicesProbe } from '@/features/playback/hooks/useAudioDevicesProbe';
 import { IS_MACOS } from '@/lib/util/platform';
 import { AudioOutputDeviceSection } from '@/features/settings/components/audio/AudioOutputDeviceSection';

src/features/settings/components/audio/HiResCrossfadeResampleBlock.tsx

@@ -2,7 +2,7 @@ import {
   HI_RES_CROSSFADE_RESAMPLE_OPTIONS,
   type HiResCrossfadeResampleHz,
   sanitizeHiResCrossfadeResampleHz,
-} from '@/utils/audio/hiResCrossfadeResample';
+} from '@/lib/audio/hiResCrossfadeResample';
 import type { TFunction } from 'i18next';
 import { SettingsSubCard, SettingsField } from '@/features/settings/components/SettingsSubCard';
 

src/features/settings/components/audio/TrackTransitionsBlock.tsx

@@ -5,7 +5,7 @@ import { useOrbitStore } from '@/features/orbit';
 import {
   AUTODJ_OVERLAP_CAP_MAX_SEC,
   AUTODJ_OVERLAP_CAP_MIN_SEC,
-} from '@/utils/playback/autodjOverlapCap';
+} from '@/lib/audio/autodjOverlapCap';
 import {
   getTransitionMode,
   setTransitionMode,

src/lib/audio/autodjOverlapCap.test.ts

@@ -3,7 +3,7 @@ import {
   autodjMaxOverlapCapSec,
   DEFAULT_AUTODJ_OVERLAP_CAP_SEC,
   sanitizeAutodjOverlapCapSec,
-} from './autodjOverlapCap';
+} from '@/lib/audio/autodjOverlapCap';
 
 describe('autodjOverlapCap', () => {
   it('sanitizes cap seconds to 2–30', () => {

src/lib/audio/autodjOverlapCap.ts

@@ -1,4 +1,4 @@
-import type { AuthState } from '../../store/authStoreTypes';
+import type { AuthState } from '@/store/authStoreTypes';
 import { DYNAMIC_OVERLAP_HARD_CAP_SEC } from '@/lib/waveform/waveformSilence';
 
 export type AutodjOverlapCapMode = 'auto' | 'limit';

src/lib/audio/hiResCrossfadeResample.test.ts

@@ -3,7 +3,7 @@ import {
   DEFAULT_HI_RES_CROSSFADE_RESAMPLE_HZ,
   audioPlayHiResBlendArgs,
   sanitizeHiResCrossfadeResampleHz,
-} from './hiResCrossfadeResample';
+} from '@/lib/audio/hiResCrossfadeResample';
 
 describe('hiResCrossfadeResample', () => {
   it('defaults unknown values to 44.1 kHz', () => {

src/store/authAudioSettingsActions.ts

@@ -1,8 +1,8 @@
-import { clampStoredLoudnessPreAnalysisAttenuationRefDb } from '../utils/audio/loudnessPreAnalysisSlider';
+import { clampStoredLoudnessPreAnalysisAttenuationRefDb } from '@/lib/audio/loudnessPreAnalysisSlider';
 import {
   sanitizeAutodjOverlapCapMode,
   sanitizeAutodjOverlapCapSec,
-} from '../utils/playback/autodjOverlapCap';
+} from '@/lib/audio/autodjOverlapCap';
 import { DEFAULT_LOUDNESS_PRE_ANALYSIS_ATTENUATION_DB } from './authStoreDefaults';
 import { updateReplayGainForCurrentTrack } from './playbackEngineBridge';
 import type { AuthState } from './authStoreTypes';

src/store/authStoreHelpers.ts

@@ -1,4 +1,4 @@
-import { clampStoredLoudnessPreAnalysisAttenuationRefDb } from '../utils/audio/loudnessPreAnalysisSlider';
+import { clampStoredLoudnessPreAnalysisAttenuationRefDb } from '@/lib/audio/loudnessPreAnalysisSlider';
 import {
   DEFAULT_LOUDNESS_PRE_ANALYSIS_ATTENUATION_DB,
   DEFAULT_LIBRARY_GRID_MAX_COLUMNS,

src/store/authStoreRehydrate.ts

@@ -1,13 +1,13 @@
 import { IS_LINUX } from '@/lib/util/platform';
-import { sanitizeHiResCrossfadeResampleHz } from '../utils/audio/hiResCrossfadeResample';
+import { sanitizeHiResCrossfadeResampleHz } from '@/lib/audio/hiResCrossfadeResample';
 import {
   sanitizeAutodjOverlapCapMode,
   sanitizeAutodjOverlapCapSec,
-} from '../utils/playback/autodjOverlapCap';
+} from '@/lib/audio/autodjOverlapCap';
 import {
   LOUDNESS_PRE_ANALYSIS_REF_TARGET_LUFS,
   clampStoredLoudnessPreAnalysisAttenuationRefDb,
-} from '../utils/audio/loudnessPreAnalysisSlider';
+} from '@/lib/audio/loudnessPreAnalysisSlider';
 import { DEFAULT_LOUDNESS_PRE_ANALYSIS_ATTENUATION_DB } from './authStoreDefaults';
 import {
   clampMixFilterMinStars,

src/store/authStoreTypes.ts

@@ -1,4 +1,4 @@
-import type { HiResCrossfadeResampleHz } from '../utils/audio/hiResCrossfadeResample';
+import type { HiResCrossfadeResampleHz } from '@/lib/audio/hiResCrossfadeResample';
 import type { EntityRatingSupportLevel } from '@/lib/api/subsonicTypes';
 import type {
   AudiomusePluginProbeResult,