expo-libvlc-player 1.0.2 → 1.0.4

package/android/build.gradle

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

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

@@ -43,7 +43,7 @@ class LibVlcPlayerView(
 
     internal var mediaLength: Long = 0L
     internal var userVolume: Int = MAX_PLAYER_VOLUME
-    internal var firstPlay: Boolean = true
+    internal var firstPlay: Boolean = false
 
     internal val onBuffering by EventDispatcher()
     internal val onPlaying by EventDispatcher()
@@ -117,7 +117,7 @@ class LibVlcPlayerView(
         removeAllViews()
     }
 
-    fun setupMediaInfo() {
+    fun setFirstPlay() {
         var mediaInfo = MediaInfo()
 
         mediaPlayer?.let { player ->
@@ -174,12 +174,14 @@ class LibVlcPlayerView(
         }
 
         onFirstPlay(mediaInfo)
+
+        firstPlay = false
     }
 
     fun setupPlayer() {
         mediaPlayer?.let { player ->
             attachPlayer()
-            setupMediaInfo()
+            setFirstPlay()
             setPlayerTracks()
 
             if (volume != MAX_PLAYER_VOLUME || mute) {
@@ -210,7 +212,6 @@ class LibVlcPlayerView(
             }
 
             time = DEFAULT_PLAYER_TIME
-            firstPlay = false
         }
     }
 
@@ -301,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

@@ -18,7 +18,7 @@ class LibVlcPlayerView: ExpoView {
 
     var mediaLength: Int32 = 0
     private var userVolume: Int = maxPlayerVolume
-    var firstPlay: Bool = true
+    var firstPlay: Bool = false
 
     let onBuffering = EventDispatcher()
     let onPlaying = EventDispatcher()
@@ -77,7 +77,7 @@ class LibVlcPlayerView: ExpoView {
         firstPlay = true
     }
 
-    func setupMediaInfo() {
+    func setFirstPlay() {
         var mediaInfo = MediaInfo()
 
         if let player = mediaPlayer {
@@ -138,12 +138,14 @@ class LibVlcPlayerView: ExpoView {
         }
 
         onFirstPlay(mediaInfo)
+
+        firstPlay = false
     }
 
     func setupPlayer() {
         guard let player = mediaPlayer else { return }
 
-        setupMediaInfo()
+        setFirstPlay()
         setPlayerTracks()
 
         if volume != maxPlayerVolume || mute {
@@ -173,7 +175,6 @@ class LibVlcPlayerView: ExpoView {
         }
 
         time = defaultPlayerTime
-        firstPlay = false
     }
 
     func destroyPlayer() {
@@ -254,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.2",
+  "version": "1.0.4",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",