expo-libvlc-player 2.0.1 → 2.0.2

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: "com.android.library"
 
 group = "expo.modules.libvlcplayer"
-version = "2.0.1"
+version = "2.0.2"
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -27,7 +27,7 @@ android {
     namespace "expo.modules.libvlcplayer"
     defaultConfig {
         versionCode 1
-        versionName "2.0.1"
+        versionName "2.0.2"
         consumerProguardFiles("proguard-rules.pro")
     }
     lintOptions {

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

@@ -151,7 +151,7 @@ class AudioFocusManager(
                                     pausePlayerIfUnmuted(player)
                                 } else {
                                     val volume = player.getVolume() / 20
-                                    view.userVolume = volume
+                                    view.oldVolume = volume
                                     player.setVolume(volume)
                                 }
                             }
@@ -166,7 +166,7 @@ class AudioFocusManager(
                         playerView.get()?.let { view ->
                             view.mediaPlayer?.let { player ->
                                 if (player.getVolume() > MIN_PLAYER_VOLUME) {
-                                    player.setVolume(view.userVolume)
+                                    player.setVolume(view.oldVolume)
                                 }
                             }
                         }

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

@@ -42,7 +42,7 @@ class LibVlcPlayerView(
     private var shouldCreate: Boolean = false
 
     internal var mediaLength: Long = 0L
-    internal var userVolume: Int = MAX_PLAYER_VOLUME
+    internal var oldVolume: Int = MAX_PLAYER_VOLUME
     internal var firstPlay: Boolean = false
 
     internal val onBuffering by EventDispatcher()
@@ -276,7 +276,7 @@ class LibVlcPlayerView(
             }
         }
 
-    var options: ArrayList<String> = ArrayList<String>()
+    var options: ArrayList<String> = ArrayList()
         set(value) {
             val old = field
             field = value
@@ -292,12 +292,13 @@ class LibVlcPlayerView(
             setPlayerTracks()
         }
 
-    var slaves: ArrayList<Slave> = ArrayList<Slave>()
+    var slaves: ArrayList<Slave> = ArrayList()
         set(value) {
-            val old = field
-            field = value
+            val newSlaves = value.filter { it !in field }
+
+            field = field.apply { addAll(newSlaves) }
 
-            if (value != old) {
+            if (!newSlaves.isEmpty()) {
                 addPlayerSlaves()
             }
         }
@@ -332,7 +333,7 @@ class LibVlcPlayerView(
             }
 
             val newVolume = value.coerceIn(MIN_PLAYER_VOLUME, MAX_PLAYER_VOLUME)
-            userVolume = newVolume
+            oldVolume = newVolume
 
             mediaPlayer?.let { player ->
                 if (player.getVolume() > MIN_PLAYER_VOLUME) {
@@ -354,7 +355,7 @@ class LibVlcPlayerView(
                 if (value) {
                     MIN_PLAYER_VOLUME
                 } else {
-                    userVolume
+                    oldVolume
                 }
 
             mediaPlayer?.setVolume(newVolume)

package/ios/LibVlcPlayerView.swift

@@ -17,7 +17,7 @@ class LibVlcPlayerView: ExpoView {
     private var shouldCreate: Bool = false
 
     var mediaLength: Int32 = 0
-    private var userVolume: Int = maxPlayerVolume
+    private var oldVolume: Int = maxPlayerVolume
     var firstPlay: Bool = false
 
     let onBuffering = EventDispatcher()
@@ -245,9 +245,16 @@ class LibVlcPlayerView: ExpoView {
         }
     }
 
-    var slaves: [Slave] = .init() {
-        didSet {
-            if slaves != oldValue {
+    private var _slaves: [Slave] = .init()
+
+    var slaves: [Slave] {
+        get { _slaves }
+        set {
+            let newSlaves = newValue.filter { !_slaves.contains($0) }
+
+            _slaves += newSlaves
+
+            if !newSlaves.isEmpty {
                 addPlayerSlaves()
             }
         }
@@ -288,7 +295,7 @@ class LibVlcPlayerView: ExpoView {
             }
 
             let newVolume = max(minPlayerVolume, min(maxPlayerVolume, volume))
-            userVolume = newVolume
+            oldVolume = newVolume
 
             if let player = mediaPlayer, let audio = player.audio {
                 if audio.volume > minPlayerVolume {
@@ -307,7 +314,7 @@ class LibVlcPlayerView: ExpoView {
 
             let newVolume = mute ?
                 minPlayerVolume :
-                userVolume
+                oldVolume
 
             mediaPlayer?.audio?.volume = Int32(newVolume)
             MediaPlayerManager.shared.setAppropriateAudioSession()

package/package.json

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