expo-libvlc-player 7.0.2 → 7.0.3

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

@@ -174,14 +174,11 @@ class LibVlcPlayerView(
     }
 
     fun createPlayer() {
-        var args = options
-        args.toggleStartPausedOption(autoplay)
-
         if (pictureInPicture) {
             MediaPlayerManager.pictureInPictureManager.setupPipView(this)
         }
 
-        libVLC = LibVLC(context, args)
+        libVLC = LibVLC(context)
         setDialogCallbacks(libVLC!!)
 
         mediaPlayer = MediaPlayer(libVLC!!)
@@ -196,7 +193,12 @@ class LibVlcPlayerView(
             return
         }
 
+        var args = options
+        args.normalizeOptions()
+        args.toggleStartPausedOption(autoplay)
+
         val media = Media(libVLC!!, Uri.parse(source!!))
+        args.forEach { arg -> media!!.addOption(arg) }
         mediaPlayer!!.setMedia(media)
         media.release()
         mediaPlayer!!.play()
@@ -216,26 +218,10 @@ class LibVlcPlayerView(
     }
 
     fun selectTrack(
-        trackId: Int?,
+        index: 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 -> {
                     player.setAudioTrack(index)
@@ -257,9 +243,9 @@ class LibVlcPlayerView(
         val videoTrack = tracks?.video
         val spuTrack = tracks?.subtitle
 
-        selectTrack(audioTrack, IMedia.Track.Type.Audio)
-        selectTrack(videoTrack, IMedia.Track.Type.Video)
-        selectTrack(spuTrack, IMedia.Track.Type.Text)
+        audioTrack?.let { audioTrack -> selectTrack(audioTrack, IMedia.Track.Type.Audio) }
+        videoTrack?.let { videoTrack -> selectTrack(videoTrack, IMedia.Track.Type.Video) }
+        spuTrack?.let { spuTrack -> selectTrack(spuTrack, IMedia.Track.Type.Text) }
     }
 
     fun addPlayerSlaves(slaves: List<Slave>) {
@@ -914,16 +900,25 @@ fun LibVlcPlayerView.setDialogCallbacks(ILibVLC: LibVLC?) {
     }
 }
 
-private fun MutableList<String>.toggleStartPausedOption(autoplay: Boolean) {
-    val options =
-        setOf(
-            "--start-paused",
-            ":start-paused",
-        )
+private fun MutableList<String>.normalizeOptions() {
+    val normalized =
+        map { option ->
+            if (!option.startsWith(":")) {
+                ":" + option.dropWhile { character -> character == '-' }
+            } else {
+                option
+            }
+        }
 
-    removeAll { option -> option in options }
+    for (i in indices) {
+        this[i] = normalized[i]
+    }
+}
+
+private fun MutableList<String>.toggleStartPausedOption(autoplay: Boolean) {
+    val hasOption = contains(":start-paused")
 
-    if (!autoplay) {
-        add("--start-paused")
+    if (!autoplay && !hasOption) {
+        add(":start-paused")
     }
 }

package/ios/LibVlcPlayerView.swift

@@ -8,6 +8,7 @@ class LibVlcPlayerView: ExpoView {
     private let playerDrawable: MediaPlayerDrawable = .init()
     private var pictureDrawable: PictureInPictureDrawable!
 
+    var library: VLCLibrary?
     var mediaPlayer: VLCMediaPlayer?
     var vlcDialog: VLCDialogProvider?
     var vlcDialogRef: NSValue?
@@ -72,10 +73,6 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func createPlayer() {
-        var args = options
-        args.toggleStartPausedOption(autoplay)
-
-        let library = VLCLibrary(options: args)
         var drawable: MediaPlayerDrawable
 
         if pictureInPicture {
@@ -86,12 +83,13 @@ class LibVlcPlayerView: ExpoView {
             drawable = playerDrawable
         }
 
-        mediaPlayer = VLCMediaPlayer(library: library)
+        library = VLCLibrary()
+        mediaPlayer = VLCMediaPlayer(library: library!)
         mediaPlayer!.drawable = drawable
         mediaPlayer!.delegate = self
         setupPlayer()
 
-        vlcDialog = VLCDialogProvider(library: library, customUI: dialogCustomUI)
+        vlcDialog = VLCDialogProvider(library: library!, customUI: dialogCustomUI)
         vlcDialog!.customRenderer = self
 
         guard let source, let url = URL(string: source) else {
@@ -99,7 +97,13 @@ class LibVlcPlayerView: ExpoView {
             return
         }
 
-        mediaPlayer!.media = VLCMedia(url: url)
+        var args = options
+        args.normalizeOptions()
+        args.toggleStartPausedOption(autoplay)
+
+        let media = VLCMedia(url: url)
+        args.forEach { arg in media!.addOption(arg) }
+        mediaPlayer!.media = media
         mediaPlayer!.play()
 
         firstPlay = true
@@ -109,41 +113,25 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func destroyPlayer() {
+        library = nil
         mediaPlayer?.stop()
         mediaPlayer = nil
         vlcDialog?.customRenderer = nil
         vlcDialog = nil
     }
 
-    func selectTrack(_ trackId: Int?, _ type: VLCMedia.TrackType) {
+    func selectTrack(_ index: Int, _ type: VLCMedia.TrackType) {
         if let player = mediaPlayer {
-            if trackId == -1 {
+            if index == -1 {
                 switch type {
                 case .audio: player.deselectAllAudioTracks()
                 case .video: player.deselectAllVideoTracks()
                 case .text: player.deselectAllTextTracks()
                 default: break
                 }
-                return
-            }
-
-            let tracks: [VLCMediaPlayer.Track]? = switch type {
-            case .audio: player.audioTracks
-            case .video: player.videoTracks
-            case .text: player.textTracks
-            default: nil
+            } else {
+                player.selectTrack(at: index, type: type)
             }
-
-            guard let tracks else { return }
-
-            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 }
-
-            player.selectTrack(at: index, type: type)
         }
     }
 
@@ -152,9 +140,9 @@ class LibVlcPlayerView: ExpoView {
         let videoTrack = tracks?.video
         let textTrack = tracks?.subtitle
 
-        selectTrack(audioTrack, .audio)
-        selectTrack(videoTrack, .video)
-        selectTrack(textTrack, .text)
+        if let audioTrack { selectTrack(audioTrack, .audio) }
+        if let videoTrack { selectTrack(videoTrack, .video) }
+        if let textTrack { selectTrack(textTrack, .text) }
     }
 
     func addPlayerSlaves(_ slaves: [Slave]) {
@@ -770,16 +758,23 @@ extension LibVlcPlayerView: VLCCustomDialogRendererProtocol {
 }
 
 private extension [String] {
-    mutating func toggleStartPausedOption(_ autoplay: Bool) {
-        let options = [
-            "--start-paused",
-            ":start-paused",
-        ]
+    mutating func normalizeOptions() {
+        self = map { option in
+            if !option.hasPrefix(":") {
+                ":" + option.drop { character in character == "-" }
+            } else {
+                option
+            }
+        }
+    }
+}
 
-        removeAll { option in options.contains(option) }
+private extension [String] {
+    mutating func toggleStartPausedOption(_ autoplay: Bool) {
+        let hasOption = self.contains(":start-paused")
 
-        if !autoplay {
-            append("--start-paused")
+        if !autoplay, !hasOption {
+            append(":start-paused")
         }
     }
 }

package/package.json

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