expo-libvlc-player 6.1.6 → 6.1.8

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

@@ -127,7 +127,7 @@ class LibVlcPlayerView(
         args.toggleStartPausedOption(autoplay)
 
         if (pictureInPicture) {
-            MediaPlayerManager.pictureInPictureManager.setupPipManager(this)
+            MediaPlayerManager.pictureInPictureManager.setupPipView(this)
         }
 
         libVLC = LibVLC(context, args)
@@ -216,26 +216,36 @@ class LibVlcPlayerView(
     }
 
     fun selectTrack(
-        track: Int?,
+        trackId: Int?,
         type: Int,
     ) {
         mediaPlayer?.let { player ->
+            val tracks =
+                when (type) {
+                    IMedia.Track.Type.Audio -> player.getAudioTracks()
+                    IMedia.Track.Type.Video -> player.getVideoTracks()
+                    IMedia.Track.Type.Text -> player.getSpuTracks()
+                    else -> null
+                }
+
+            if (tracks == null) return
+
+            val firstTrack = tracks.firstOrNull { track -> track.id != -1 }
+            val firstTrackId = firstTrack?.id
+            val index = trackId ?: firstTrackId
+
+            if (index == null) return
+
             when (type) {
                 IMedia.Track.Type.Audio -> {
-                    val firstTrack = player.getAudioTracks()?.firstOrNull { track -> track.id != -1 }?.id
-                    val index = track ?: firstTrack ?: player.getAudioTrack()
                     player.setAudioTrack(index)
                 }
 
                 IMedia.Track.Type.Video -> {
-                    val firstTrack = player.getVideoTracks()?.firstOrNull { track -> track.id != -1 }?.id
-                    val index = track ?: firstTrack ?: player.getVideoTrack()
                     player.setVideoTrack(index)
                 }
 
                 IMedia.Track.Type.Text -> {
-                    val firstTrack = player.getSpuTracks()?.firstOrNull { track -> track.id != -1 }?.id
-                    val index = track ?: firstTrack ?: player.getSpuTrack()
                     player.setSpuTrack(index)
                 }
             }

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

@@ -33,6 +33,18 @@ class PictureInPictureManager(
     private var pipFragment: PictureInPictureFragment? = null
     private var pipReceiver: BroadcastReceiver? = null
     private var pipView: LibVlcPlayerView? = null
+        set(value) {
+            field = value
+
+            val canSetupPip = value != null && isPictureInPictureSupported()
+
+            if (canSetupPip) {
+                setupPipFragment()
+                setupPipReceiver()
+                setPipParams()
+                setPipActions()
+            }
+        }
 
     private val rootChildrenVisibility: MutableMap<Int, Int> = mutableMapOf()
 
@@ -47,13 +59,8 @@ class PictureInPictureManager(
     private val pictureInPicture: Boolean
         get() = pipView?.pictureInPicture == true
 
-    fun setupPipManager(view: LibVlcPlayerView) {
-        if (!isPictureInPictureSupported()) return
+    fun setupPipView(view: LibVlcPlayerView) {
         pipView = view
-        setupPipFragment()
-        setupPipReceiver()
-        setPipParams()
-        setPipActions()
     }
 
     private fun setupPipFragment() {
@@ -310,7 +317,7 @@ class PictureInPictureManager(
 
     fun startPictureInPicture(view: LibVlcPlayerView) {
         maybeThrowPipException()
-        setupPipManager(view)
+        setupPipView(view)
         enterPictureInPicture()
     }
 

package/ios/LibVlcPlayerView.swift

@@ -115,9 +115,9 @@ class LibVlcPlayerView: ExpoView {
         vlcDialog = nil
     }
 
-    func selectTrack(_ track: Int?, _ type: VLCMedia.TrackType) {
+    func selectTrack(_ trackId: Int?, _ type: VLCMedia.TrackType) {
         if let player = mediaPlayer {
-            if track == -1 {
+            if trackId == -1 {
                 switch type {
                 case .audio: player.deselectAllAudioTracks()
                 case .video: player.deselectAllVideoTracks()
@@ -136,9 +136,10 @@ class LibVlcPlayerView: ExpoView {
 
             guard let tracks else { return }
 
-            let trackId = tracks.first?.trackId
-            let firstId = trackId.map { id in (id as NSString).intValue }
-            let index = track ?? firstId.map { id in Int(id) }
+            let firstTrack = tracks.first?.trackId
+            let firstTrackInt = firstTrack.map { id in (id as NSString).intValue }
+            let firstTrackId = firstTrackInt.map { id in Int(id) }
+            let index = trackId ?? firstTrackId
 
             guard let index else { return }
 

package/ios/Utils/MediaPlayerDrawable.swift

@@ -1,6 +1,7 @@
 class MediaPlayerDrawable: UIView {
     init() {
         super.init(frame: .zero)
+        isUserInteractionEnabled = false
         autoresizingMask = [.flexibleWidth, .flexibleHeight]
         backgroundColor = .black
     }

package/ios/Utils/PictureInPictureDrawable.swift

@@ -41,7 +41,7 @@ class PictureInPictureDrawable: MediaPlayerDrawable {
         }
     }
 
-    func maybeThrowPipException() throws {
+    private func maybeThrowPipException() throws {
         if !AVPictureInPictureController.isPictureInPictureSupported() {
             throw PictureInPictureUnsupportedException()
         } else if !pictureInPicture {

package/package.json

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