expo-libvlc-player 7.0.14 → 7.0.16

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

@@ -55,7 +55,7 @@ class LibVlcPlayerView(
 ) : ExpoView(context, appContext) {
     val playerLayout: VLCVideoLayout = VLCVideoLayout(context)
     val pictureLayout: VLCVideoLayout = VLCVideoLayout(context)
-    private var pauseIfJob: Job? = null
+    private var pauseCoroutine: Job? = null
 
     var libVLC: LibVLC? = null
     var mediaPlayer: MediaPlayer? = null
@@ -573,25 +573,23 @@ class LibVlcPlayerView(
         mediaPlayer?.pause()
     }
 
-    fun pauseIf(condition: Boolean? = true) {
-        cancelPauseIf()
+    fun pauseJob() {
+        cancelPauseJob()
 
-        pauseIfJob =
+        pauseCoroutine =
             CoroutineScope(Dispatchers.Main).launch {
-                delay(MediaPlayerConstants.COROUTINE_DELAY_MS)
-
-                mediaPlayer?.let { player ->
-                    val shouldPause = condition == true && player.isPlaying()
+                if (pictureInPicture) {
+                    delay(MediaPlayerConstants.COROUTINE_DELAY_MS)
+                }
 
-                    if (shouldPause) {
-                        player.pause()
-                    }
+                if (isInBackground) {
+                    mediaPlayer?.pause()
                 }
             }
     }
 
-    fun cancelPauseIf() {
-        pauseIfJob?.cancel()
+    fun cancelPauseJob() {
+        pauseCoroutine?.cancel()
     }
 
     fun stop() {
@@ -725,7 +723,7 @@ class LibVlcPlayerView(
         delay: Double = MediaPlayerConstants.RETRY_DELAY_MS,
         block: (isLastAttempt: Boolean) -> Boolean,
     ) {
-        val isLastAttempt = retry >= maxRetries
+        val isLastAttempt = retry > maxRetries
 
         if (block(isLastAttempt) || isLastAttempt) return
 

package/android/src/main/java/expo/modules/libvlcplayer/constants/MediaPlayerConstants.kt

@@ -15,8 +15,8 @@ object MediaPlayerConstants {
     const val EXTRA_CONTROL_FORWARD: Int = 4
     const val SEEK_STEP_MS: Long = 10_000L
 
-    const val COROUTINE_DELAY_MS: Long = 1_000L
+    const val COROUTINE_DELAY_MS: Long = 750L
     const val EXP_DELAY_MULTIPLIER: Double = 1.5
-    const val RETRY_DELAY_MS: Double = 200.0
-    const val MAX_RETRY_COUNT: Int = 5
+    const val RETRY_DELAY_MS: Double = 300.0
+    const val MAX_RETRY_COUNT: Int = 3
 }

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

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

package/android/src/main/java/expo/modules/libvlcplayer/utils/PictureInPictureFragment.kt

@@ -17,10 +17,10 @@ class PictureInPictureFragment(
         expoView.get()?.let { view ->
             if (isInPictureInPictureMode) {
                 view.onStartPictureInPicture()
-                view.cancelPauseIf()
+                view.cancelPauseJob()
             } else {
                 view.onStopPictureInPicture()
-                view.pauseIf(view.isInBackground)
+                view.pauseJob()
             }
         }
     }

package/ios/Constants/MediaPlayerConstants.swift

@@ -6,6 +6,6 @@ enum MediaPlayerConstants {
     static let maxPlayerVolume: Int = 100
 
     static let expDelayMultiplier: Double = 1.5
-    static let retryDelayMs: Double = 200.0
-    static let maxRetryCount: Int = 5
+    static let retryDelayMs: Double = 300.0
+    static let maxRetryCount: Int = 3
 }

package/ios/LibVlcPlayerView.swift

@@ -436,13 +436,9 @@ class LibVlcPlayerView: ExpoView {
         mediaPlayer?.pause()
     }
 
-    func pauseIf(_ condition: Bool? = true) {
-        if let player = mediaPlayer {
-            let shouldPause = condition == true && player.isPlaying
-
-            if shouldPause {
-                player.pause()
-            }
+    func pausePip() {
+        if !pictureInPicture {
+            mediaPlayer?.pause()
         }
     }
 
@@ -557,7 +553,7 @@ class LibVlcPlayerView: ExpoView {
         delay: Double = MediaPlayerConstants.retryDelayMs,
         block: @escaping (_ isLastAttempt: Bool) -> Bool
     ) {
-        let isLastAttempt = retry >= maxRetries
+        let isLastAttempt = retry > maxRetries
 
         if block(isLastAttempt) || isLastAttempt { return }
 

package/ios/Managers/MediaPlayerManager.swift

@@ -25,16 +25,16 @@ class MediaPlayerManager {
 
     func onModuleForeground() {
         for view in expoViews.allObjects {
-            view.onForeground()
             view.isInBackground = false
+            view.onForeground()
         }
     }
 
     func onModuleBackground() {
         for view in expoViews.allObjects {
-            view.onBackground()
-            view.pauseIf(!view.pictureInPicture)
             view.isInBackground = true
+            view.onBackground()
+            view.pausePip()
         }
     }
 }

package/package.json

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