expo-libvlc-player 7.0.19 → 7.0.21

package/README.md

@@ -287,15 +287,15 @@ interface MediaInfo {
 
 #### Black screen
 
-On Android, the `libvlcjni` player detaches from the View when its surface is destroyed after switching screens.
+On Android, the `libvlcjni` player detaches from the View after switching screens.
 
-The current workaround attaches the View once a surface is created but this causes a brief black screen.
+The current workaround attaches the View back but it causes a brief black screen.
 
 https://code.videolan.org/videolan/vlc-android/-/issues/1495
 
-On iOS, the `VLCKit` player deallocates from the UIView when closing the Picture-in-Picture (PiP) window.
+On iOS, the `VLCKit` player deselects the video track after switching screens.
 
-The current workaround exclusively selects the current video track but this causes a brief black screen.
+The current workaround selects the video track back but it causes a brief black screen.
 
 https://code.videolan.org/videolan/VLCKit/-/issues/743
 

package/android/src/main/java/expo/modules/libvlcplayer/LibVlcPlayerView.kt

@@ -63,7 +63,6 @@ class LibVlcPlayerView(
 
     var firstPlay: Boolean = true
     private var shouldInit: Boolean = true
-    var isInBackground: Boolean = false
 
     val onBuffering by EventDispatcher<Unit>()
     val onPlaying by EventDispatcher<Unit>()

package/android/src/main/java/expo/modules/libvlcplayer/managers/MediaPlayerManager.kt

@@ -42,7 +42,6 @@ object MediaPlayerManager {
 
     fun onModuleForeground() {
         expoViews.forEach { view ->
-            view.isInBackground = false
             view.onForeground(Unit)
             view.cancelPauseJob()
         }
@@ -50,7 +49,6 @@ object MediaPlayerManager {
 
     fun onModuleBackground() {
         expoViews.forEach { view ->
-            view.isInBackground = true
             view.onBackground(Unit)
             view.pauseJob()
         }

package/ios/LibVlcPlayerView.swift

@@ -307,15 +307,6 @@ class LibVlcPlayerView: ExpoView {
 
         videoTrack.isSelected = false
         videoTrack.isSelectedExclusively = true
-
-        // Black screen workaround
-        let delay = DispatchTimeInterval.milliseconds(Int(MediaPlayerConstants.resetDelayMs))
-        let deadline = DispatchTime.now() + delay
-        let time = VLCTime(int: Int32(player.time.intValue))
-
-        DispatchQueue.main.asyncAfter(deadline: deadline) {
-            player.time = time
-        }
     }
 
     var hasVideoSize: Bool {
@@ -479,6 +470,15 @@ class LibVlcPlayerView: ExpoView {
         }
     }
 
+    func seekZero() {
+        guard let player = mediaPlayer,
+              !player.isPlaying
+        else { return }
+
+        // Black screen workaround
+        player.time = VLCTime(int: Int32(player.time.intValue))
+    }
+
     func record(_ path: String?) {
         if let player = mediaPlayer {
             if let path {

package/ios/Managers/AudioSessionManager.swift

@@ -20,7 +20,7 @@ class AudioSessionManager {
         let audioMixingMode = findAudioMixingMode()
         var audioSessionCategoryOptions: AVAudioSession.CategoryOptions = audioSession.categoryOptions
 
-        let isOutputtingAudio = expoViews.allObjects.contains { view in
+        let anyPlayingView = expoViews.allObjects.contains { view in
             if let player = view.mediaPlayer, let audio = player.audio {
                 player.isPlaying && audio.volume > MediaPlayerConstants.minPlayerVolume
             } else {
@@ -30,9 +30,9 @@ class AudioSessionManager {
 
         let shouldMixOverride = audioMixingMode == .mixWithOthers
         let doNotMixOverride = audioMixingMode == .doNotMix
-        let shouldDuckOthers = audioMixingMode == .duckOthers && isOutputtingAudio
+        let shouldDuckOthers = audioMixingMode == .duckOthers && anyPlayingView
 
-        let shouldMixWithOthers = shouldMixOverride || !isOutputtingAudio
+        let shouldMixWithOthers = shouldMixOverride || !anyPlayingView
 
         if shouldMixWithOthers && !shouldDuckOthers && !doNotMixOverride {
             audioSessionCategoryOptions.insert(.mixWithOthers)
@@ -54,7 +54,7 @@ class AudioSessionManager {
             }
         }
 
-        if isOutputtingAudio || doNotMixOverride {
+        if anyPlayingView || doNotMixOverride {
             do {
                 try audioSession.setActive(true)
             } catch {

package/ios/Managers/KeepAwakeManager.swift

@@ -1,9 +1,7 @@
 class KeepAwakeManager {
     static let shared = KeepAwakeManager()
 
-    private lazy var anyPlayingView = MediaPlayerManager.shared.expoViews.allObjects.contains { view in
-        view.mediaPlayer?.isPlaying == true
-    }
+    private lazy var expoViews = MediaPlayerManager.shared.expoViews
 
     func activateKeepAwake() {
         DispatchQueue.main.async {
@@ -18,6 +16,10 @@ class KeepAwakeManager {
     }
 
     func toggleKeepAwake() {
+        let anyPlayingView = expoViews.allObjects.contains { view in
+            view.mediaPlayer?.isPlaying == true
+        }
+
         if anyPlayingView {
             activateKeepAwake()
         } else {

package/ios/Managers/MediaPlayerManager.swift

@@ -27,6 +27,7 @@ class MediaPlayerManager {
         for view in expoViews.allObjects {
             view.isInBackground = false
             view.onForeground()
+            view.seekZero()
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "7.0.19",
+  "version": "7.0.21",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",