expo-libvlc-player 7.1.3 → 7.1.4

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

@@ -63,6 +63,7 @@ class LibVlcPlayerView(
 
     var firstPlay: Boolean = true
     private var shouldInit: Boolean = true
+    var shouldRepeat: Boolean = true
 
     val onBuffering by EventDispatcher()
     val onPlaying by EventDispatcher<Unit>()
@@ -183,6 +184,7 @@ class LibVlcPlayerView(
         mediaPlayer = MediaPlayer(libVLC!!)
         attachPlayerLayout(playerLayout)
         setPlayerListener(mediaPlayer!!)
+        addPlayerSlaves(slaves)
         setupPlayer()
 
         try {
@@ -328,8 +330,6 @@ class LibVlcPlayerView(
     fun setupPlayer() {
         post {
             mediaPlayer?.let { player ->
-                addPlayerSlaves(slaves)
-
                 if (scale != MediaPlayerConstants.DEFAULT_PLAYER_SCALE) {
                     player.setScale(scale.toFloat())
                 }
@@ -467,16 +467,16 @@ class LibVlcPlayerView(
     var volume: Int = MediaPlayerConstants.MAX_PLAYER_VOLUME
         set(value) {
             val oldValue = field
-            field = value
-
-            if (mute) return
-
             val newVolume =
                 value.coerceIn(
                     MediaPlayerConstants.MIN_PLAYER_VOLUME,
                     MediaPlayerConstants.MAX_PLAYER_VOLUME,
                 )
 
+            field = newVolume
+
+            if (mute) return
+
             mediaPlayer?.setVolume(newVolume)
 
             val hadVolume = oldValue > MediaPlayerConstants.MIN_PLAYER_VOLUME
@@ -558,6 +558,7 @@ class LibVlcPlayerView(
     }
 
     fun stop() {
+        shouldRepeat = false
         mediaPlayer?.stop()
     }
 
@@ -712,6 +713,8 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                             onPlaying(Unit)
 
                             if (firstPlay) {
+                                setupPlayer()
+
                                 setPlayerTracks()
 
                                 retryUntil { isLastAttempt ->
@@ -754,9 +757,11 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
 
                             firstPlay = true
 
-                            if (repeat) {
+                            if (repeat && shouldRepeat) {
                                 player.play()
                             }
+
+                            shouldRepeat = true
                         }
 
                         MediaPlayerManager.keepAwakeManager.toggleKeepAwake()

package/ios/LibVlcPlayerModule.swift

@@ -91,8 +91,8 @@ public class LibVlcPlayerModule: Module {
                 view.audioMixingMode = audioMixingMode
             }
 
-            Prop("repeat", false) { (view: LibVlcPlayerView, shouldRepeat: Bool) in
-                view.shouldRepeat = shouldRepeat
+            Prop("repeat", false) { (view: LibVlcPlayerView, Repeat: Bool) in
+                view.Repeat = Repeat
             }
 
             Prop("autoplay", true) { (view: LibVlcPlayerView, autoplay: Bool) in

package/ios/LibVlcPlayerView.swift

@@ -17,6 +17,7 @@ class LibVlcPlayerView: ExpoView {
 
     var firstPlay: Bool = true
     private var shouldInit: Bool = true
+    private var shouldRepeat: Bool = true
 
     let onBuffering = EventDispatcher()
     let onPlaying = EventDispatcher()
@@ -80,6 +81,7 @@ class LibVlcPlayerView: ExpoView {
         mediaPlayer = VLCMediaPlayer(library: library!)
         mediaPlayer!.drawable = drawable
         mediaPlayer!.delegate = self
+        addPlayerSlaves(slaves)
         setupPlayer()
 
         vlcDialog = VLCDialogProvider(library: library!, customUI: dialogCustomUI)
@@ -202,8 +204,6 @@ class LibVlcPlayerView: ExpoView {
             guard let self else { return }
 
             if let player = mediaPlayer {
-                addPlayerSlaves(slaves)
-
                 if scale != MediaPlayerConstants.defaultPlayerScale {
                     player.scaleFactor = Float(scale)
                 }
@@ -357,15 +357,21 @@ class LibVlcPlayerView: ExpoView {
 
     var time: Int = MediaPlayerConstants.defaultPlayerTime
 
-    var volume: Int = MediaPlayerConstants.maxPlayerVolume {
-        didSet {
-            if mute { return }
+    var _volume: Int = MediaPlayerConstants.maxPlayerVolume
 
+    var volume: Int {
+        get { _volume }
+        set {
+            let oldValue = _volume
             let newVolume = max(
                 MediaPlayerConstants.minPlayerVolume,
-                min(MediaPlayerConstants.maxPlayerVolume, volume)
+                min(MediaPlayerConstants.maxPlayerVolume, newValue)
             )
 
+            _volume = newVolume
+
+            if mute { return }
+
             mediaPlayer?.audio?.volume = Int32(newVolume)
 
             let hadVolume = oldValue > MediaPlayerConstants.minPlayerVolume
@@ -398,7 +404,7 @@ class LibVlcPlayerView: ExpoView {
         }
     }
 
-    var shouldRepeat: Bool = false
+    var Repeat: Bool = false
 
     var autoplay: Bool = true
 
@@ -428,6 +434,7 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func stop() {
+        shouldRepeat = false
         mediaPlayer?.stop()
     }
 
@@ -547,6 +554,8 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                     onPlaying()
 
                     if firstPlay {
+                        setupPlayer()
+
                         setPlayerTracks()
 
                         retryUntil { [weak self] isLastAttempt in
@@ -593,9 +602,11 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
 
                     firstPlay = true
 
-                    if shouldRepeat {
+                    if Repeat, shouldRepeat {
                         player.play()
                     }
+
+                    shouldRepeat = true
                 }
 
                 MediaPlayerManager.shared.keepAwakeManager.toggleKeepAwake()

package/package.json

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