From fed96d1fce15681f21be46d997fca66a1db28444 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sun, 21 May 2023 03:08:25 -0700
Subject: [PATCH] Additional player adjustments

- Set volume on play
- Explicitly pause/play on set queue
---
 src/main/features/core/player/index.ts                    | 2 ++
 src/renderer/app.tsx                                      | 3 ++-
 src/renderer/features/player/hooks/use-center-controls.ts | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/features/core/player/index.ts b/src/main/features/core/player/index.ts
index e1e97f85..d58e548c 100644
--- a/src/main/features/core/player/index.ts
+++ b/src/main/features/core/player/index.ts
@@ -87,6 +87,8 @@ ipcMain.on('player-set-queue', async (_event, data: PlayerData, pause?: boolean)
 
   if (pause) {
     await getMpvInstance()?.pause();
+  } else {
+    await getMpvInstance()?.play();
   }
 });
 
diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx
index 9949bee2..438f5c9c 100644
--- a/src/renderer/app.tsx
+++ b/src/renderer/app.tsx
@@ -47,13 +47,14 @@ export const App = () => {
       const extraParameters = useSettingsStore.getState().playback.mpvExtraParameters;
       const properties = {
         ...getMpvProperties(useSettingsStore.getState().playback.mpvProperties),
-        volume: usePlayerStore.getState().volume || 50,
       };
 
       mpvPlayer?.initialize({
         extraParameters,
         properties,
       });
+
+      mpvPlayer?.volume(properties.volume);
     }
 
     return () => {
diff --git a/src/renderer/features/player/hooks/use-center-controls.ts b/src/renderer/features/player/hooks/use-center-controls.ts
index 8eb93a8d..ca2640fb 100644
--- a/src/renderer/features/player/hooks/use-center-controls.ts
+++ b/src/renderer/features/player/hooks/use-center-controls.ts
@@ -93,6 +93,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
     mprisUpdateSong({ status: PlayerStatus.PLAYING });
 
     if (isMpvPlayer) {
+      mpvPlayer?.volume(usePlayerStore.getState().volume);
       mpvPlayer.play();
     } else {
       currentPlayerRef.getInternalPlayer().play();