expo-libvlc-player 6.1.4 → 6.1.5

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

@@ -134,8 +134,9 @@ class LibVlcPlayerView(
         setDialogCallbacks(libVLC!!)
 
         mediaPlayer = MediaPlayer(libVLC!!)
-        setPlayerListener(mediaPlayer!!)
         attachPlayerLayout(playerLayout)
+        setPlayerListener(mediaPlayer!!)
+        setupPlayer()
 
         try {
             URI(source)
@@ -332,33 +333,35 @@ class LibVlcPlayerView(
     }
 
     fun setupPlayer() {
-        mediaPlayer?.let { player ->
-            addPlayerSlaves()
+        post {
+            mediaPlayer?.let { player ->
+                addPlayerSlaves()
 
-            if (scale != MediaPlayerConstants.DEFAULT_PLAYER_SCALE) {
-                player.setScale(scale)
-            }
+                if (scale != MediaPlayerConstants.DEFAULT_PLAYER_SCALE) {
+                    player.setScale(scale)
+                }
 
-            if (rate != MediaPlayerConstants.DEFAULT_PLAYER_RATE) {
-                player.setRate(rate)
-            }
+                if (rate != MediaPlayerConstants.DEFAULT_PLAYER_RATE) {
+                    player.setRate(rate)
+                }
 
-            if (time != MediaPlayerConstants.DEFAULT_PLAYER_TIME) {
-                player.setTime(time.toLong())
-            }
+                if (time != MediaPlayerConstants.DEFAULT_PLAYER_TIME) {
+                    player.setTime(time.toLong())
+                }
 
-            if (volume != MediaPlayerConstants.MAX_PLAYER_VOLUME || mute) {
-                val newVolume =
-                    if (mute) {
-                        MediaPlayerConstants.MIN_PLAYER_VOLUME
-                    } else {
-                        volume
-                    }
+                if (volume != MediaPlayerConstants.MAX_PLAYER_VOLUME || mute) {
+                    val newVolume =
+                        if (mute) {
+                            MediaPlayerConstants.MIN_PLAYER_VOLUME
+                        } else {
+                            volume
+                        }
 
-                player.setVolume(newVolume)
-            }
+                    player.setVolume(newVolume)
+                }
 
-            time = MediaPlayerConstants.DEFAULT_PLAYER_TIME
+                time = MediaPlayerConstants.DEFAULT_PLAYER_TIME
+            }
         }
     }
 
@@ -745,12 +748,8 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                         if (type == Event.Playing) {
                             onPlaying(Unit)
 
-                            setPlayerTracks()
-
                             if (firstPlay) {
-                                setupPlayer()
-
-                                firstPlay = false
+                                setPlayerTracks()
 
                                 retryUntil { isLastAttempt ->
                                     if (hasVideoOut || isLastAttempt) {
@@ -768,6 +767,8 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
 
                                     return@retryUntil hasVideoSize
                                 }
+
+                                firstPlay = false
                             }
                         }
 
@@ -780,6 +781,8 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
 
                             resetPlayer()
 
+                            firstPlay = true
+
                             if (repeat) {
                                 player.play()
                             }

package/ios/LibVlcPlayerView.swift

@@ -88,6 +88,7 @@ class LibVlcPlayerView: ExpoView {
         mediaPlayer = VLCMediaPlayer(options: args)
         mediaPlayer!.drawable = drawable
         mediaPlayer!.delegate = self
+        setupPlayer()
 
         let library = mediaPlayer!.libraryInstance
         vlcDialog = VLCDialogProvider(library: library, customUI: dialogCustomUI)
@@ -214,30 +215,34 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func setupPlayer() {
-        if let player = mediaPlayer {
-            addPlayerSlaves()
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
 
-            if scale != MediaPlayerConstants.defaultPlayerScale {
-                player.scaleFactor = scale
-            }
+            if let player = mediaPlayer {
+                addPlayerSlaves()
 
-            if rate != MediaPlayerConstants.defaultPlayerRate {
-                player.rate = rate
-            }
+                if scale != MediaPlayerConstants.defaultPlayerScale {
+                    player.scaleFactor = scale
+                }
 
-            if time != MediaPlayerConstants.defaultPlayerTime {
-                player.time = VLCTime(int: Int32(time))
-            }
+                if rate != MediaPlayerConstants.defaultPlayerRate {
+                    player.rate = rate
+                }
+
+                if time != MediaPlayerConstants.defaultPlayerTime {
+                    player.time = VLCTime(int: Int32(time))
+                }
 
-            if volume != MediaPlayerConstants.maxPlayerVolume || mute {
-                let newVolume = mute ?
-                    MediaPlayerConstants.minPlayerVolume :
-                    volume
+                if volume != MediaPlayerConstants.maxPlayerVolume || mute {
+                    let newVolume = mute ?
+                        MediaPlayerConstants.minPlayerVolume :
+                        volume
 
-                player.audio?.volume = Int32(newVolume)
-            }
+                    player.audio?.volume = Int32(newVolume)
+                }
 
-            time = MediaPlayerConstants.defaultPlayerTime
+                time = MediaPlayerConstants.defaultPlayerTime
+            }
         }
     }
 
@@ -566,12 +571,8 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                 if newState == .playing {
                     onPlaying()
 
-                    setPlayerTracks()
-
                     if firstPlay {
-                        setupPlayer()
-
-                        firstPlay = false
+                        setPlayerTracks()
 
                         retryUntil { [weak self] isLastAttempt in
                             guard let self else { return true }
@@ -593,6 +594,8 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
 
                             return hasVideoSize
                         }
+
+                        firstPlay = false
                     }
                 }
 
@@ -603,6 +606,8 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                 if newState == .stopped {
                     onStopped()
 
+                    firstPlay = true
+
                     if shouldRepeat {
                         player.play()
                     }

package/package.json

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