From 27cbc23d87c0d2b9e5e20a23a3eb2029b932c365 Mon Sep 17 00:00:00 2001 From: jeffvli Date: Thu, 9 Mar 2023 12:51:30 -0800 Subject: [PATCH] Set default mpv gapless-audio config to weak (#45) --- src/main/main.ts | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main/main.ts b/src/main/main.ts index c9a649d9..7a7c5c59 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -179,24 +179,29 @@ export const getMainWindow = () => { return mainWindow; }; -const BINARY_PATH = store.get('mpv_path') as string | undefined; +const MPV_BINARY_PATH = store.get('mpv_path') as string | undefined; const MPV_PARAMETERS = store.get('mpv_parameters') as Array | undefined; + +const gaplessAudioParams = [ + '--gapless-audio=weak', + '--gapless-audio=no', + '--gapless-audio=yes', + '--gapless-audio', +]; + +const prefetchPlaylistParams = [ + '--prefetch-playlist=no', + '--prefetch-playlist=yes', + '--prefetch-playlist', +]; + const DEFAULT_MPV_PARAMETERS = () => { const parameters = []; - if ( - !MPV_PARAMETERS?.includes('--gapless-audio=weak') || - !MPV_PARAMETERS?.includes('--gapless-audio=no') || - !MPV_PARAMETERS?.includes('--gapless-audio=yes') || - !MPV_PARAMETERS?.includes('--gapless-audio') - ) { - parameters.push('--gapless-audio=yes'); + if (!MPV_PARAMETERS?.some((param) => gaplessAudioParams.includes(param))) { + parameters.push('--gapless-audio=weak'); } - if ( - !MPV_PARAMETERS?.includes('--prefetch-playlist=no') || - !MPV_PARAMETERS?.includes('--prefetch-playlist=yes') || - !MPV_PARAMETERS?.includes('--prefetch-playlist') - ) { + if (!MPV_PARAMETERS?.some((param) => prefetchPlaylistParams.includes(param))) { parameters.push('--prefetch-playlist=yes'); } @@ -207,7 +212,7 @@ export const mpv = new MpvAPI( { audio_only: true, auto_restart: true, - binary: BINARY_PATH || '', + binary: MPV_BINARY_PATH || '', time_update: 1, }, MPV_PARAMETERS