expo-libvlc-player 7.0.39 → 7.0.40

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

@@ -359,42 +359,21 @@ class LibVlcPlayerView(
     }
 
     fun getMediaTracks(): MediaTracks {
-        var mediaTracks = MediaTracks()
+        val player = mediaPlayer ?: return MediaTracks()
 
-        mediaPlayer?.let { player ->
-            val audioTracks = mutableListOf<Track>()
-            val audios = player.getAudioTracks()
-
-            audios?.forEach { track ->
-                val trackObj = Track(id = track.id, name = track.name)
-                audioTracks.add(trackObj)
-            }
-
-            val videoTracks = mutableListOf<Track>()
-            val videos = player.getVideoTracks()
-
-            videos?.forEach { track ->
-                val trackObj = Track(id = track.id, name = track.name)
-                videoTracks.add(trackObj)
-            }
+        val audios = player.getAudioTracks()?.map { track -> Track(id = track.id, name = track.name) }
+        val videos = player.getVideoTracks()?.map { track -> Track(id = track.id, name = track.name) }
+        val subtitles = player.getSpuTracks()?.map { track -> Track(id = track.id, name = track.name) }
 
-            val subtitleTracks = mutableListOf<Track>()
-            val subtitles = player.getSpuTracks()
+        val audio = audios ?: emptyList()
+        val video = videos ?: emptyList()
+        val subtitle = subtitles ?: emptyList()
 
-            subtitles?.forEach { track ->
-                val trackObj = Track(id = track.id, name = track.name)
-                subtitleTracks.add(trackObj)
-            }
-
-            mediaTracks =
-                MediaTracks(
-                    audio = audioTracks,
-                    video = videoTracks,
-                    subtitle = subtitleTracks,
-                )
-        }
-
-        return mediaTracks
+        return MediaTracks(
+            audio = audio,
+            video = video,
+            subtitle = subtitle,
+        )
     }
 
     fun getMediaLength(): Int = (mediaPlayer?.getLength() ?: 0).toInt()
@@ -413,9 +392,8 @@ class LibVlcPlayerView(
     }
 
     fun getVideoSize(): Size {
-        val video = mediaPlayer?.getCurrentVideoTrack()
-        if (video != null) return Size(video.width, video.height)
-        return Size(0, 0)
+        val video = mediaPlayer?.getCurrentVideoTrack() ?: return Size(0, 0)
+        return Size(video.width, video.height)
     }
 
     val hasVideoSize: Boolean
@@ -424,20 +402,16 @@ class LibVlcPlayerView(
             return video.width > 0 && video.height > 0
         }
 
-    val hasVideoOut: Boolean
+    val hasMediaLength: Boolean
         get() {
-            val tracks = getMediaTracks()
             val length = getMediaLength()
-            val hasVideo = tracks.video.any { track -> track.id != -1 }
-            return hasVideo && hasVideoSize && length > 0
+            return length > 0
         }
 
-    val hasAudioOut: Boolean
+    val hasMediaVolume: Boolean
         get() {
-            val tracks = getMediaTracks()
-            val hasAudio = tracks.audio.any { track -> track.id != -1 }
             val volume = mediaPlayer?.getVolume() ?: MediaPlayerConstants.MIN_PLAYER_VOLUME
-            return hasAudio && volume > MediaPlayerConstants.MIN_PLAYER_VOLUME
+            return volume > MediaPlayerConstants.MIN_PLAYER_VOLUME
         }
 
     var source: String? = null
@@ -741,11 +715,11 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                                 setPlayerTracks()
 
                                 retryUntil { isLastAttempt ->
-                                    if (hasVideoOut || isLastAttempt) {
+                                    if (hasMediaLength || isLastAttempt) {
                                         onFirstPlay(getMediaInfo())
                                     }
 
-                                    return@retryUntil hasVideoOut
+                                    return@retryUntil hasMediaLength
                                 }
 
                                 retryUntil {
@@ -758,11 +732,11 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                                 }
 
                                 retryUntil {
-                                    if (hasAudioOut) {
+                                    if (hasMediaVolume) {
                                         MediaPlayerManager.audioFocusManager.updateAudioFocus()
                                     }
 
-                                    return@retryUntil hasAudioOut
+                                    return@retryUntil hasMediaVolume
                                 }
 
                                 firstPlay = false

package/android/src/main/java/expo/modules/libvlcplayer/records/MediaTracks.kt

@@ -6,8 +6,8 @@ import expo.modules.libvlcplayer.records.Track
 import java.io.Serializable
 
 class MediaTracks(
-    @Field var audio: MutableList<Track> = mutableListOf(),
-    @Field var video: MutableList<Track> = mutableListOf(),
-    @Field var subtitle: MutableList<Track> = mutableListOf(),
+    @Field var audio: List<Track> = emptyList(),
+    @Field var video: List<Track> = emptyList(),
+    @Field var subtitle: List<Track> = emptyList(),
 ) : Record,
     Serializable

package/ios/LibVlcPlayerView.swift

@@ -237,13 +237,15 @@ class LibVlcPlayerView: ExpoView {
     func getMediaTracks() -> MediaTracks {
         guard let player = mediaPlayer else { return MediaTracks() }
 
-        let audioTracks = player.audioTracks.enumerated()
-        let videoTracks = player.videoTracks.enumerated()
-        let subtitleTracks = player.textTracks.enumerated()
+        let disableTrack = Track(id: -1, name: "Disable")
 
-        let audio = audioTracks.map { index, audio in Track(id: index, name: audio.trackName) }
-        let video = videoTracks.map { index, video in Track(id: index, name: video.trackName) }
-        let subtitle = subtitleTracks.map { index, subtitle in Track(id: index, name: subtitle.trackName) }
+        let audios = player.audioTracks.enumerated()
+        let videos = player.videoTracks.enumerated()
+        let subtitles = player.textTracks.enumerated()
+
+        let audio = [disableTrack] + audios.map { index, audio in Track(id: index, name: audio.trackName) }
+        let video = [disableTrack] + videos.map { index, video in Track(id: index, name: video.trackName) }
+        let subtitle = [disableTrack] + subtitles.map { index, subtitle in Track(id: index, name: subtitle.trackName) }
 
         return MediaTracks(
             audio: audio,
@@ -270,8 +272,8 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func getVideoSize() -> CGSize {
-        if let size = mediaPlayer?.videoSize { return size }
-        return CGSize(width: 0, height: 0)
+        guard let size = mediaPlayer?.videoSize else { return CGSize(width: 0, height: 0) }
+        return size
     }
 
     func resetVideoTrack() {
@@ -291,18 +293,14 @@ class LibVlcPlayerView: ExpoView {
         return video.width > 0 && video.height > 0
     }
 
-    var hasVideoOut: Bool {
-        let tracks = getMediaTracks()
+    var hasMediaLength: Bool {
         let length = getMediaLength()
-        let hasVideo = tracks.video.count > 0
-        return hasVideo && hasVideoSize && length > 0
+        return length > 0
     }
 
-    var hasAudioOut: Bool {
-        let tracks = getMediaTracks()
-        let hasAudio = tracks.audio.count > 0
+    var hasMediaVolume: Bool {
         let volume = mediaPlayer?.audio?.volume ?? Int32(MediaPlayerConstants.minPlayerVolume)
-        return hasAudio && volume > MediaPlayerConstants.minPlayerVolume
+        return volume > MediaPlayerConstants.minPlayerVolume
     }
 
     var source: String? {
@@ -556,11 +554,11 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                         retryUntil { [weak self] isLastAttempt in
                             guard let self else { return true }
 
-                            if hasVideoOut || isLastAttempt {
+                            if hasMediaLength || isLastAttempt {
                                 onFirstPlay(getMediaInfo())
                             }
 
-                            return hasVideoOut
+                            return hasMediaLength
                         }
 
                         retryUntil { [weak self] _ in
@@ -577,11 +575,11 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                         retryUntil { [weak self] _ in
                             guard let self else { return true }
 
-                            if hasAudioOut {
+                            if hasMediaVolume {
                                 MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
                             }
 
-                            return hasAudioOut
+                            return hasMediaVolume
                         }
 
                         firstPlay = false

package/package.json

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