expo-libvlc-player 1.0.3 → 1.0.4

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: "com.android.library"
 
 group = "expo.modules.libvlcplayer"
-version = "1.0.3"
+version = "1.0.4"
 
 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 "1.0.3"
+        versionName "1.0.4"
         consumerProguardFiles("proguard-rules.pro")
     }
     lintOptions {

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

@@ -302,26 +302,30 @@ class LibVlcPlayerView(
                 onEncounteredError(error)
             }
 
-            val volume = value.coerceIn(MIN_PLAYER_VOLUME, MAX_PLAYER_VOLUME)
-            userVolume = volume
+            val newVolume = value.coerceIn(MIN_PLAYER_VOLUME, MAX_PLAYER_VOLUME)
+            userVolume = newVolume
 
-            mediaPlayer?.setVolume(volume)
+            mediaPlayer?.let { player ->
+                if (player.getVolume() > MIN_PLAYER_VOLUME) {
+                    player.setVolume(newVolume)
+                }
+            }
 
             field = value
         }
 
     var mute: Boolean = false
         set(value) {
-            if (options.hasAudioOption()) {
+            if (!value && options.hasAudioOption()) {
                 val error = mapOf("error" to "Audio disabled via options")
                 onEncounteredError(error)
             }
 
             val newVolume =
-                if (!value) {
-                    userVolume.coerceIn(PLAYER_VOLUME_STEP, MAX_PLAYER_VOLUME)
-                } else {
+                if (value) {
                     MIN_PLAYER_VOLUME
+                } else {
+                    userVolume
                 }
 
             mediaPlayer?.setVolume(newVolume)

package/ios/LibVlcPlayerView.swift

@@ -255,20 +255,24 @@ class LibVlcPlayerView: ExpoView {
             let newVolume = max(minPlayerVolume, min(maxPlayerVolume, volume))
             userVolume = newVolume
 
-            mediaPlayer?.audio?.volume = Int32(newVolume)
+            if let player = mediaPlayer, let audio = player.audio {
+                if audio.volume > minPlayerVolume {
+                    audio.volume = Int32(newVolume)
+                }
+            }
         }
     }
 
     var mute: Bool = false {
         didSet {
-            if options.hasAudioOption() {
+            if !mute, options.hasAudioOption() {
                 let error = ["error": "Audio disabled via options"]
                 onEncounteredError(error)
             }
 
-            let newVolume = !mute ?
-                max(playerVolumeStep, min(maxPlayerVolume, userVolume)) :
-                minPlayerVolume
+            let newVolume = mute ?
+                minPlayerVolume :
+                userVolume
 
             mediaPlayer?.audio?.volume = Int32(newVolume)
             MediaPlayerManager.shared.setAppropriateAudioSession()

package/ios/MediaPlayerManager.swift

@@ -49,9 +49,8 @@ class MediaPlayerManager {
         var audioSessionCategoryOptions: AVAudioSession.CategoryOptions = audioSession.categoryOptions
 
         let isOutputtingAudio = playerViews.allObjects.contains { view in
-            guard let player = view.mediaPlayer else { return false }
-
-            return player.isPlaying && player.audio?.isMuted == false
+            guard let player = view.mediaPlayer, let audio = player.audio else { return false }
+            return player.isPlaying && audio.volume > minPlayerVolume
         }
 
         let shouldMixOverride = audioMixingMode == .mixWithOthers

package/package.json

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