From f0c0e804fa0e7e572b4adce72988da61050137af Mon Sep 17 00:00:00 2001
From: Xavier Araque <francisco.araque@toolfactory.net>
Date: Fri, 7 Nov 2025 17:11:47 +0100
Subject: [PATCH] fix: critical AudioContext and setStartTime

---
 ui/src/audioplayer/Player.jsx                |  7 +++++--
 ui/src/audioplayer/hooks/useAudioInstance.js | 19 ++++++++++---------
 ui/src/audioplayer/hooks/useScrobbling.js    |  1 +
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ui/src/audioplayer/Player.jsx b/ui/src/audioplayer/Player.jsx
index a8a508cfa..3a5453c3b 100644
--- a/ui/src/audioplayer/Player.jsx
+++ b/ui/src/audioplayer/Player.jsx
@@ -63,6 +63,7 @@ const Player = () => {
 
   const {
     startTime,
+    setStartTime,
     scrobbled,
     onAudioProgress,
     onAudioPlayTrackChange,
@@ -74,7 +75,6 @@ const Player = () => {
 
   const { audioInstance, setAudioInstance, onAudioPlay } = useAudioInstance(
     isMobilePlayer,
-    null, // context will be managed separately
   )
 
   const { context } = useReplayGain(audioInstance, playerState, gainInfo)
@@ -172,12 +172,13 @@ const Player = () => {
   const handleAudioPlay = useCallback(
     (info) => {
       onAudioPlay(
+        context,
         info,
         (info) => dispatchCurrentPlaying(info),
         showNotifications,
         sendNotification,
         startTime,
-        (time) => {}, // setStartTime is handled in hook
+        setStartTime,
         resetPreloading,
         config,
         ReactGA,
@@ -185,9 +186,11 @@ const Player = () => {
     },
     [
       onAudioPlay,
+      context,
       dispatchCurrentPlaying,
       showNotifications,
       startTime,
+      setStartTime,
       resetPreloading,
     ],
   )
diff --git a/ui/src/audioplayer/hooks/useAudioInstance.js b/ui/src/audioplayer/hooks/useAudioInstance.js
index ebb42e2b2..56b24b118 100644
--- a/ui/src/audioplayer/hooks/useAudioInstance.js
+++ b/ui/src/audioplayer/hooks/useAudioInstance.js
@@ -1,25 +1,26 @@
 import { useCallback, useEffect, useState } from 'react'
+import subsonic from '../../subsonic'
 
 /**
  * Custom hook for managing the audio instance and related effects.
- * Handles audio element setup, mobile volume adjustments, and context resumption.
+ * Handles audio element setup and mobile volume adjustments.
  *
  * @param {boolean} isMobilePlayer - Whether the player is running on a mobile device.
- * @param {AudioContext|null} context - Web Audio API context from replay gain hook.
  * @returns {Object} Audio instance-related state and handlers.
  * @returns {HTMLAudioElement|null} audioInstance - The audio element instance.
  * @returns {Function} setAudioInstance - Setter for the audio instance.
  * @returns {Function} onAudioPlay - Handler for audio play events.
  *
  * @example
- * const { audioInstance, setAudioInstance, onAudioPlay } = useAudioInstance(isMobilePlayer, context);
+ * const { audioInstance, setAudioInstance, onAudioPlay } = useAudioInstance(isMobilePlayer);
  */
-export const useAudioInstance = (isMobilePlayer, context) => {
+export const useAudioInstance = (isMobilePlayer) => {
   const [audioInstance, setAudioInstance] = useState(null)
 
   /**
    * Handles audio play events, resuming context if needed and updating document title.
    *
+   * @param {AudioContext|null} audioContext - Web Audio API context from replay gain hook.
    * @param {Object} info - Audio play information.
    * @param {Object} info.song - Song metadata.
    * @param {number} info.duration - Track duration.
@@ -37,6 +38,7 @@ export const useAudioInstance = (isMobilePlayer, context) => {
    */
   const onAudioPlay = useCallback(
     (
+      audioContext,
       info,
       dispatchCurrentPlaying,
       showNotifications,
@@ -48,9 +50,9 @@ export const useAudioInstance = (isMobilePlayer, context) => {
       ReactGA,
     ) => {
       // Resume audio context if suspended
-      if (context && context.state !== 'running') {
+      if (audioContext && audioContext.state !== 'running') {
         try {
-          context.resume()
+          audioContext.resume()
         } catch (error) {
           // eslint-disable-next-line no-console
           console.error('Error resuming audio context:', error)
@@ -69,9 +71,8 @@ export const useAudioInstance = (isMobilePlayer, context) => {
 
         if (!info.isRadio) {
           const pos = startTime === null ? null : Math.floor(info.currentTime)
-          // Assuming subsonic.nowPlaying is imported or passed
           try {
-            // subsonic.nowPlaying(info.trackId, pos) // Uncomment if subsonic is available
+            subsonic.nowPlaying(info.trackId, pos)
           } catch (error) {
             // eslint-disable-next-line no-console
             console.error('Error updating now playing:', error)
@@ -107,7 +108,7 @@ export const useAudioInstance = (isMobilePlayer, context) => {
         }
       }
     },
-    [context],
+    [],
   )
 
   // Mobile volume adjustment effect
diff --git a/ui/src/audioplayer/hooks/useScrobbling.js b/ui/src/audioplayer/hooks/useScrobbling.js
index 2341395b3..cab3ca830 100644
--- a/ui/src/audioplayer/hooks/useScrobbling.js
+++ b/ui/src/audioplayer/hooks/useScrobbling.js
@@ -110,6 +110,7 @@ export const useScrobbling = (playerState, dispatch, dataProvider) => {
 
   return {
     startTime,
+    setStartTime,
     scrobbled,
     onAudioProgress,
     onAudioPlayTrackChange,