From ba6322bb1f31d10fcf3708ac13a7c31cb253fcd5 Mon Sep 17 00:00:00 2001
From: Fredrik Burmester <fredrik.burmester@gmail.com>
Date: Sat, 12 Oct 2024 13:41:09 +0200
Subject: [PATCH] wip

---
 app/(auth)/vlc-player.tsx                  | 15 +++--
 modules/vlc-player/ios/VlcPlayerView.swift | 66 +++++++++++++++-------
 modules/vlc-player/src/VlcPlayer.types.ts  |  2 +
 3 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/app/(auth)/vlc-player.tsx b/app/(auth)/vlc-player.tsx
index 6616de8e..22f03840 100644
--- a/app/(auth)/vlc-player.tsx
+++ b/app/(auth)/vlc-player.tsx
@@ -152,9 +152,16 @@ export default function page() {
       if (isSeeking.value === true) return;
       if (isPlaybackStopped === true) return;
 
-      const { currentTime, duration } = data.nativeEvent;
+      const { currentTime, duration, isBuffering, isPlaying } =
+        data.nativeEvent;
+
+      console.log("onProgress ~", {
+        currentTime,
+        duration,
+        isBuffering,
+        isPlaying,
+      });
 
-      console.log("onProgress ~", currentTime);
       progress.value = currentTime;
 
       // cacheProgress.value = secondsToTicks(data.playableDuration);
@@ -297,7 +304,7 @@ export default function page() {
         />
       </Pressable>
 
-      <VideoDebugInfo
+      {/* <VideoDebugInfo
         style={{
           position: "absolute",
           top: 0,
@@ -310,7 +317,7 @@ export default function page() {
           duration: 0,
         }}
         playerRef={videoRef}
-      />
+      /> */}
 
       <Controls
         item={playSettings.item}
diff --git a/modules/vlc-player/ios/VlcPlayerView.swift b/modules/vlc-player/ios/VlcPlayerView.swift
index 19d84e45..5ff5f0a3 100644
--- a/modules/vlc-player/ios/VlcPlayerView.swift
+++ b/modules/vlc-player/ios/VlcPlayerView.swift
@@ -431,36 +431,51 @@ extension VlcPlayerView: VLCMediaPlayerDelegate {
                 "isBuffering": currentState == .buffering,
             ]
 
-            switch currentState {
-            case .opening:
-                stateInfo["state"] = "Opening"
-            case .buffering:
-                stateInfo["state"] = "Buffering"
-                stateInfo["isBuffering"] = true
-            case .playing:
+            if player.state == .playing {
+                stateInfo["isPlaying"] = true
+                stateInfo["isBuffering"] = false
                 stateInfo["state"] = "Playing"
-            case .paused:
-                stateInfo["state"] = "Paused"
-            case .stopped:
-                stateInfo["state"] = "Stopped"
-            case .ended:
-                stateInfo["state"] = "Ended"
-            case .error:
-                stateInfo["state"] = "Error"
-            default:
-                stateInfo["state"] = "Unknown"
             }
 
-            if currentState != self.lastReportedState {
-                self.lastReportedState = currentState
-                self.onVideoStateChange?(stateInfo)
+            if player.state == .buffering {
+                stateInfo["isBuffering"] = true
+                stateInfo["state"] = "Buffering"
             }
+
+            if player.state == .paused {
+                stateInfo["isPlaying"] = false
+                stateInfo["state"] = "Paused"
+            }
+
+            // switch currentState {
+            // case .opening:
+            //     stateInfo["state"] = "Opening"
+            // case .buffering:
+            //     stateInfo["state"] = "Buffering"
+            //     stateInfo["isBuffering"] = true
+            // case .playing:
+            //     stateInfo["state"] = "Playing"
+            // case .paused:
+            //     stateInfo["state"] = "Paused"
+            // case .stopped:
+            //     stateInfo["state"] = "Stopped"
+            // case .ended:
+            //     stateInfo["state"] = "Ended"
+            // case .error:
+            //     stateInfo["state"] = "Error"
+            // default:
+            //     stateInfo["state"] = "Unknown"
+            // }
+
+            self.lastReportedState = currentState
+            self.onVideoStateChange?(stateInfo)
         }
     }
 
     func mediaPlayerTimeChanged(_ aNotification: Notification) {
         DispatchQueue.main.async { [weak self] in
             self?.updateVideoProgress()
+            self?.updatePlayerState()
         }
     }
 
@@ -472,11 +487,20 @@ extension VlcPlayerView: VLCMediaPlayerDelegate {
             let durationMs = player.media?.length.intValue ?? 0
 
             if currentTimeMs >= 0 && currentTimeMs < durationMs {
+                let isPlaying = player.isPlaying
+                let isBuffering = player.state == .buffering
+
                 self.onVideoProgress?([
-                    "target": self.reactTag ?? NSNull(),
                     "currentTime": currentTimeMs,
                     "duration": durationMs,
+                    "isPlaying": isPlaying,
+                    "isBuffering": isBuffering,
                 ])
+
+                // Debug log
+                print(
+                    "VLC Player State: \(player.state.description), isPlaying: \(isPlaying), isBuffering: \(isBuffering)"
+                )
             }
         }
     }
diff --git a/modules/vlc-player/src/VlcPlayer.types.ts b/modules/vlc-player/src/VlcPlayer.types.ts
index 7e1c074d..a4720647 100644
--- a/modules/vlc-player/src/VlcPlayer.types.ts
+++ b/modules/vlc-player/src/VlcPlayer.types.ts
@@ -21,6 +21,8 @@ export type ProgressUpdatePayload = {
   nativeEvent: {
     currentTime: number;
     duration: number;
+    isPlaying: boolean;
+    isBuffering: boolean;
   };
 };