expo-libvlc-player 7.0.25 → 7.0.26

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

@@ -502,6 +502,7 @@ class LibVlcPlayerView(
 
     var volume: Int = MediaPlayerConstants.MAX_PLAYER_VOLUME
         set(value) {
+            val oldValue = field
             field = value
 
             if (mute) return
@@ -511,9 +512,15 @@ class LibVlcPlayerView(
                     MediaPlayerConstants.MIN_PLAYER_VOLUME,
                     MediaPlayerConstants.MAX_PLAYER_VOLUME,
                 )
+
             mediaPlayer?.setVolume(newVolume)
 
-            MediaPlayerManager.audioFocusManager.updateAudioFocus()
+            val hadVolume = oldValue > MediaPlayerConstants.MIN_PLAYER_VOLUME
+            val hasVolume = newVolume > MediaPlayerConstants.MIN_PLAYER_VOLUME
+
+            if (hadVolume != hasVolume) {
+                MediaPlayerManager.audioFocusManager.updateAudioFocus()
+            }
         }
 
     var mute: Boolean = false

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

@@ -31,7 +31,7 @@ class AudioFocusManager(
 
     private var currentFocusRequest: AudioFocusRequest? = null
 
-    private val anyPlayerRequiresFocus: Boolean
+    private val anyPlayingView: Boolean
         get() =
             expoViews.any { view ->
                 playerRequiresFocus(view.mediaPlayer)
@@ -89,7 +89,7 @@ class AudioFocusManager(
 
     fun updateAudioFocus() {
         appContext.mainQueue.launch {
-            if (anyPlayerRequiresFocus || findAudioMixingMode() != currentMixingMode) {
+            if (anyPlayingView || findAudioMixingMode() != currentMixingMode) {
                 requestAudioFocus()
             } else {
                 abandonAudioFocus()
@@ -97,12 +97,10 @@ class AudioFocusManager(
         }
     }
 
-    private fun playerRequiresFocus(player: MediaPlayer?): Boolean =
-        if (player != null) {
-            player.isPlaying() && player.getVolume() > MediaPlayerConstants.MIN_PLAYER_VOLUME
-        } else {
-            false
-        }
+    private fun playerRequiresFocus(mediaPlayer: MediaPlayer?): Boolean {
+        val player = mediaPlayer ?: return false
+        return player.isPlaying() && player.getVolume() > MediaPlayerConstants.MIN_PLAYER_VOLUME
+    }
 
     private fun findAudioMixingMode(): AudioMixingMode {
         val mixingModes =
@@ -122,7 +120,7 @@ class AudioFocusManager(
     private fun requestAudioFocus() {
         val audioMixingMode = findAudioMixingMode()
 
-        if (audioMixingMode == AudioMixingMode.MIX_WITH_OTHERS || !anyPlayerRequiresFocus) {
+        if (audioMixingMode == AudioMixingMode.MIX_WITH_OTHERS || !anyPlayingView) {
             abandonAudioFocus()
             currentMixingMode = audioMixingMode
             return

package/ios/LibVlcPlayerView.swift

@@ -395,9 +395,15 @@ class LibVlcPlayerView: ExpoView {
                 MediaPlayerConstants.minPlayerVolume,
                 min(MediaPlayerConstants.maxPlayerVolume, volume)
             )
+
             mediaPlayer?.audio?.volume = Int32(newVolume)
 
-            MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
+            let hadVolume = oldValue > MediaPlayerConstants.minPlayerVolume
+            let hasVolume = newVolume > MediaPlayerConstants.minPlayerVolume
+
+            if hadVolume != hasVolume {
+                MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
+            }
         }
     }
 

package/ios/Managers/AudioSessionManager.swift

@@ -1,6 +1,7 @@
 import AVFoundation
 import ExpoModulesCore
 import Foundation
+import VLCKit
 
 class AudioSessionManager {
     static let shared = AudioSessionManager()
@@ -21,11 +22,7 @@ class AudioSessionManager {
         var audioSessionCategoryOptions: AVAudioSession.CategoryOptions = audioSession.categoryOptions
 
         let anyPlayingView = expoViews.allObjects.contains { view in
-            if let player = view.mediaPlayer, let audio = player.audio {
-                player.isPlaying && audio.volume > MediaPlayerConstants.minPlayerVolume
-            } else {
-                false
-            }
+            playerRequiresCategory(view.mediaPlayer)
         }
 
         let shouldMixOverride = audioMixingMode == .mixWithOthers
@@ -54,15 +51,18 @@ class AudioSessionManager {
             }
         }
 
-        if anyPlayingView || doNotMixOverride {
-            do {
-                try audioSession.setActive(true)
-            } catch {
-                log.warn("Failed to activate the audio session")
-            }
+        do {
+            try audioSession.setActive(anyPlayingView || doNotMixOverride)
+        } catch {
+            log.warn("Failed to set the audio session")
         }
     }
 
+    private func playerRequiresCategory(_ mediaPlayer: VLCMediaPlayer?) -> Bool {
+        guard let player = mediaPlayer, let audio = player.audio else { return false }
+        return player.isPlaying && audio.volume > MediaPlayerConstants.minPlayerVolume
+    }
+
     private func findAudioMixingMode() -> AudioMixingMode? {
         let playingViews = expoViews.allObjects.filter { view in
             view.mediaPlayer?.isPlaying == true

package/package.json

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