expo-libvlc-player 5.0.3 → 5.0.4

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

@@ -42,7 +42,7 @@ class LibVlcPlayerModule : Module() {
             }
 
             OnActivityEntersForeground {
-                MediaPlayerManager.keepAwakeManager.activateKeepAwake()
+                MediaPlayerManager.keepAwakeManager.toggleKeepAwake()
                 MediaPlayerManager.onModuleForeground()
             }
 

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

@@ -638,7 +638,7 @@ fun LibVlcPlayerView.setPlayerListener(player: MediaPlayer) {
 
                     attachPlayer()
 
-                    MediaPlayerManager.keepAwakeManager.activateKeepAwake()
+                    MediaPlayerManager.keepAwakeManager.toggleKeepAwake()
 
                     retryUntil {
                         val volume = player.getVolume()
@@ -651,7 +651,7 @@ fun LibVlcPlayerView.setPlayerListener(player: MediaPlayer) {
                 Event.Paused -> {
                     onPaused(Unit)
 
-                    MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
+                    MediaPlayerManager.keepAwakeManager.toggleKeepAwake()
                     MediaPlayerManager.audioFocusManager.updateAudioFocus()
                 }
 
@@ -660,7 +660,7 @@ fun LibVlcPlayerView.setPlayerListener(player: MediaPlayer) {
 
                     detachPlayer()
 
-                    MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
+                    MediaPlayerManager.keepAwakeManager.toggleKeepAwake()
                     MediaPlayerManager.audioFocusManager.updateAudioFocus()
                 }
 

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

@@ -8,6 +8,7 @@ import android.os.Build
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.Exceptions
+import expo.modules.libvlcplayer.LibVlcPlayerView
 import expo.modules.libvlcplayer.constants.MediaPlayerConstants
 import expo.modules.libvlcplayer.enums.AudioMixingMode
 import kotlinx.coroutines.launch
@@ -25,11 +26,14 @@ class AudioFocusManager(
         }
     }
 
+    private val playerViews: MutableSet<LibVlcPlayerView>
+        get() = MediaPlayerManager.playerViews
+
     private var currentFocusRequest: AudioFocusRequest? = null
 
     private val anyPlayerRequiresFocus: Boolean
         get() =
-            MediaPlayerManager.playerViews.any { view ->
+            playerViews.any { view ->
                 playerRequiresFocus(view.mediaPlayer)
             }
 
@@ -41,7 +45,7 @@ class AudioFocusManager(
         appContext.mainQueue.launch {
             when (focusChange) {
                 AudioManager.AUDIOFOCUS_LOSS -> {
-                    MediaPlayerManager.playerViews.forEach { view ->
+                    playerViews.forEach { view ->
                         pausePlayerIfUnmuted(view.mediaPlayer)
                     }
 
@@ -55,7 +59,7 @@ class AudioFocusManager(
                         return@launch
                     }
 
-                    MediaPlayerManager.playerViews.forEach { view ->
+                    playerViews.forEach { view ->
                         pausePlayerIfUnmuted(view.mediaPlayer)
                     }
 
@@ -65,7 +69,7 @@ class AudioFocusManager(
                 AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
                     val audioMixingMode = findAudioMixingMode()
 
-                    MediaPlayerManager.playerViews.forEach { view ->
+                    playerViews.forEach { view ->
                         if (audioMixingMode == AudioMixingMode.DO_NOT_MIX) {
                             pausePlayerIfUnmuted(view.mediaPlayer)
                         } else {
@@ -75,7 +79,7 @@ class AudioFocusManager(
                 }
 
                 AudioManager.AUDIOFOCUS_GAIN -> {
-                    MediaPlayerManager.playerViews.forEach { view ->
+                    playerViews.forEach { view ->
                         unduckPlayer(view.mediaPlayer)
                     }
                 }
@@ -102,7 +106,7 @@ class AudioFocusManager(
 
     private fun findAudioMixingMode(): AudioMixingMode {
         val mixingModes =
-            MediaPlayerManager.playerViews
+            playerViews
                 .filter { view -> view.mediaPlayer?.isPlaying() == true }
                 .map { view -> view.audioMixingMode }
 

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

@@ -11,6 +11,12 @@ class KeepAwakeManager(
     private val activity: Activity
         get() = appContext.currentActivity ?: throw Exceptions.MissingActivity()
 
+    private val anyPlayingView: Boolean
+        get() =
+            MediaPlayerManager.playerViews.any { view ->
+                view.mediaPlayer?.isPlaying() == true
+            }
+
     fun activateKeepAwake() {
         activity.let { activity ->
             activity.runOnUiThread {
@@ -26,4 +32,12 @@ class KeepAwakeManager(
             }
         }
     }
+
+    fun toggleKeepAwake() {
+        if (anyPlayingView) {
+            activateKeepAwake()
+        } else {
+            deactivateKeepAwake()
+        }
+    }
 }

package/ios/LibVlcPlayerModule.swift

@@ -31,7 +31,7 @@ public class LibVlcPlayerModule: Module {
         }
 
         OnAppEntersForeground {
-            MediaPlayerManager.shared.keepAwakeManager.activateKeepAwake()
+            MediaPlayerManager.shared.keepAwakeManager.toggleKeepAwake()
             MediaPlayerManager.shared.onModuleForeground()
         }
 

package/ios/LibVlcPlayerView.swift

@@ -136,18 +136,18 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func setContentFit() {
-        DispatchQueue.main.async {
-            let view = self.playerView
+        DispatchQueue.main.async { [self] in
+            let view = playerView
             var transform: CGAffineTransform = .identity
 
-            if let player = self.mediaPlayer {
+            if let player = mediaPlayer {
                 let video = player.videoSize
 
-                if self.hasVideoSize() {
+                if hasVideoSize() {
                     let viewAspect = view.frame.size.width / view.frame.size.height
                     let videoAspect = video.width / video.height
 
-                    switch self.contentFit {
+                    switch contentFit {
                     case .contain:
                         // No transform required
                         break
@@ -504,14 +504,14 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                 onPlaying()
 
                 if firstPlay {
-                    retryUntil {
-                        self.onFirstPlay(self.getMediaInfo())
-                        return self.hasAudioVideo()
+                    retryUntil { [self] in
+                        onFirstPlay(getMediaInfo())
+                        return hasAudioVideo()
                     }
 
-                    retryUntil {
-                        self.setContentFit()
-                        return self.hasVideoSize()
+                    retryUntil { [self] in
+                        setContentFit()
+                        return hasVideoSize()
                     }
 
                     setupPlayer()
@@ -519,10 +519,10 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                     firstPlay = false
                 }
 
-                MediaPlayerManager.shared.keepAwakeManager.activateKeepAwake()
+                MediaPlayerManager.shared.keepAwakeManager.toggleKeepAwake()
 
                 retryUntil {
-                    let volume = Int(player.audio?.volume ?? Int32(MediaPlayerConstants.minPlayerVolume))
+                    let volume = player.audio?.volume ?? Int32(MediaPlayerConstants.minPlayerVolume)
                     let hasVolume = volume > MediaPlayerConstants.minPlayerVolume
                     MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
                     return hasVolume
@@ -530,12 +530,12 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
             case .paused:
                 onPaused()
 
-                MediaPlayerManager.shared.keepAwakeManager.deactivateKeepAwake()
+                MediaPlayerManager.shared.keepAwakeManager.toggleKeepAwake()
                 MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
             case .stopped:
                 onStopped()
 
-                MediaPlayerManager.shared.keepAwakeManager.deactivateKeepAwake()
+                MediaPlayerManager.shared.keepAwakeManager.toggleKeepAwake()
                 MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
             case .ended:
                 onEndReached()

package/ios/Managers/AudioSessionManager.swift

@@ -7,6 +7,8 @@ class AudioSessionManager {
 
     private static let managerQueue = DispatchQueue(label: "audioManagerQueue")
 
+    private lazy var playerViews = MediaPlayerManager.shared.playerViews
+
     func setAppropriateAudioSession() {
         Self.managerQueue.async { [weak self] in
             self?.setAudioSession()
@@ -18,7 +20,7 @@ class AudioSessionManager {
         let audioMixingMode = findAudioMixingMode()
         var audioSessionCategoryOptions: AVAudioSession.CategoryOptions = audioSession.categoryOptions
 
-        let isOutputtingAudio = MediaPlayerManager.shared.playerViews.allObjects.contains { view in
+        let isOutputtingAudio = playerViews.allObjects.contains { view in
             if let player = view.mediaPlayer, let audio = player.audio {
                 player.isPlaying && audio.volume > MediaPlayerConstants.minPlayerVolume
             } else {
@@ -62,7 +64,7 @@ class AudioSessionManager {
     }
 
     private func findAudioMixingMode() -> AudioMixingMode? {
-        let playingViews = MediaPlayerManager.shared.playerViews.allObjects.filter { view in
+        let playingViews = playerViews.allObjects.filter { view in
             view.mediaPlayer?.isPlaying == true
         }
 
@@ -72,8 +74,8 @@ class AudioSessionManager {
             return nil
         }
 
-        for playerView in playingViews where (audioMixingMode.priority()) < playerView.audioMixingMode.priority() {
-            audioMixingMode = playerView.audioMixingMode
+        for view in playingViews where (audioMixingMode.priority()) < view.audioMixingMode.priority() {
+            audioMixingMode = view.audioMixingMode
         }
 
         return audioMixingMode

package/ios/Managers/KeepAwakeManager.swift

@@ -1,6 +1,10 @@
 class KeepAwakeManager {
     static let shared = KeepAwakeManager()
 
+    private lazy var anyPlayingView = MediaPlayerManager.shared.playerViews.allObjects.contains { view in
+        view.mediaPlayer?.isPlaying == true
+    }
+
     func activateKeepAwake() {
         DispatchQueue.main.async {
             UIApplication.shared.isIdleTimerDisabled = true
@@ -12,4 +16,12 @@ class KeepAwakeManager {
             UIApplication.shared.isIdleTimerDisabled = false
         }
     }
+
+    func toggleKeepAwake() {
+        if anyPlayingView {
+            activateKeepAwake()
+        } else {
+            deactivateKeepAwake()
+        }
+    }
 }

package/package.json

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