expo-libvlc-player 0.1.39 → 0.1.40

package/android/build.gradle

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

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

@@ -10,11 +10,9 @@ import expo.modules.kotlin.exception.CodedException
 import expo.modules.libvlcplayer.enums.AudioMixingMode
 import kotlinx.coroutines.launch
 import org.videolan.libvlc.MediaPlayer
-import java.lang.ref.WeakReference
 
 class AudioFocusManager(
     private val appContext: AppContext,
-    private var playerViews: MutableList<WeakReference<LibVlcPlayerView>>,
 ) : AudioManager.OnAudioFocusChangeListener {
     private val audioManager by lazy {
         appContext.reactContext?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: run {
@@ -25,8 +23,8 @@ class AudioFocusManager(
     private var currentFocusRequest: AudioFocusRequest? = null
     private val anyPlayerRequiresFocus: Boolean
         get() =
-            playerViews.toList().any { weakView ->
-                weakView.get()?.let { view ->
+            MediaPlayerManager.playerViews.toList().any { playerView ->
+                playerView.get()?.let { view ->
                     playerRequiresFocus(view.mediaPlayer)
                 } ?: false
             }
@@ -38,7 +36,7 @@ class AudioFocusManager(
 
     private fun findAudioMixingMode(): AudioMixingMode {
         val mixingModes =
-            playerViews.toList().mapNotNull { view ->
+            MediaPlayerManager.playerViews.toList().mapNotNull { view ->
                 view.get()?.takeIf { it.mediaPlayer?.isPlaying() == true }?.audioMixingMode
             }
 
@@ -118,7 +116,7 @@ class AudioFocusManager(
         when (focusChange) {
             AudioManager.AUDIOFOCUS_LOSS -> {
                 appContext.mainQueue.launch {
-                    playerViews.forEach { view ->
+                    MediaPlayerManager.playerViews.forEach { view ->
                         pausePlayerIfUnmuted(view.get()?.mediaPlayer)
                     }
 
@@ -134,7 +132,7 @@ class AudioFocusManager(
                 }
 
                 appContext.mainQueue.launch {
-                    playerViews.forEach { view ->
+                    MediaPlayerManager.playerViews.forEach { view ->
                         pausePlayerIfUnmuted(view.get()?.mediaPlayer)
                     }
 
@@ -146,8 +144,8 @@ class AudioFocusManager(
                 val audioMixingMode = findAudioMixingMode()
 
                 appContext.mainQueue.launch {
-                    playerViews.forEach { weakView ->
-                        weakView.get()?.let { view ->
+                    MediaPlayerManager.playerViews.forEach { playerView ->
+                        playerView.get()?.let { view ->
                             view.mediaPlayer?.let { player ->
                                 if (audioMixingMode == AudioMixingMode.DO_NOT_MIX) {
                                     pausePlayerIfUnmuted(player)
@@ -164,8 +162,8 @@ class AudioFocusManager(
 
             AudioManager.AUDIOFOCUS_GAIN -> {
                 appContext.mainQueue.launch {
-                    playerViews.forEach { weakView ->
-                        weakView.get()?.let { view ->
+                    MediaPlayerManager.playerViews.forEach { playerView ->
+                        playerView.get()?.let { view ->
                             view.mediaPlayer?.let { player ->
                                 if (player.getVolume() > MIN_PLAYER_VOLUME) {
                                     player.setVolume(view.userVolume)
@@ -179,9 +177,9 @@ class AudioFocusManager(
     }
 
     private fun pausePlayerIfUnmuted(player: MediaPlayer?) {
-        player?.let { mediaPlayer ->
-            if (mediaPlayer.getVolume() > MIN_PLAYER_VOLUME) {
-                mediaPlayer.pause()
+        player?.let { mPlayer ->
+            if (mPlayer.getVolume() > MIN_PLAYER_VOLUME) {
+                mPlayer.pause()
             }
         }
     }

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

@@ -61,15 +61,15 @@ class LibVlcPlayerModule : Module() {
                 }
 
                 Prop("volume") { view: LibVlcPlayerView, volume: Int? ->
-                    view.setVolume(volume ?: MAX_PLAYER_VOLUME)
+                    view.volume = volume ?: MAX_PLAYER_VOLUME
                 }
 
                 Prop("mute") { view: LibVlcPlayerView, mute: Boolean? ->
-                    view.setMute(mute ?: false)
+                    view.mute = mute ?: false
                 }
 
                 Prop("rate") { view: LibVlcPlayerView, rate: Float? ->
-                    view.setRate(rate ?: DEFAULT_PLAYER_RATE)
+                    view.rate = rate ?: DEFAULT_PLAYER_RATE
                 }
 
                 Prop("time") { view: LibVlcPlayerView, time: Int? ->
@@ -77,11 +77,11 @@ class LibVlcPlayerModule : Module() {
                 }
 
                 Prop("repeat") { view: LibVlcPlayerView, repeat: Boolean? ->
-                    view.setRepeat(repeat ?: false)
+                    view.repeat = repeat ?: false
                 }
 
                 Prop("aspectRatio") { view: LibVlcPlayerView, aspectRatio: String? ->
-                    view.setAspectRatio(aspectRatio)
+                    view.aspectRatio = aspectRatio
                 }
 
                 Prop("audioMixingMode") { view: LibVlcPlayerView, audioMixingMode: AudioMixingMode? ->
@@ -93,7 +93,7 @@ class LibVlcPlayerModule : Module() {
                 }
 
                 Prop("autoplay") { view: LibVlcPlayerView, autoplay: Boolean? ->
-                    view.setAutoplay(autoplay ?: true)
+                    view.autoplay = autoplay ?: true
                 }
 
                 OnViewDestroys { view: LibVlcPlayerView ->

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

@@ -17,6 +17,7 @@ import java.util.UUID
 
 const val DEFAULT_PLAYER_RATE: Float = 1f
 const val DEFAULT_PLAYER_TIME: Int = 0
+
 const val MIN_PLAYER_VOLUME: Int = 0
 const val MAX_PLAYER_VOLUME: Int = 100
 const val PLAYER_VOLUME_STEP: Int = 10
@@ -37,9 +38,6 @@ class LibVlcPlayerView(
     internal var media: Media? = null
     private var shouldCreate: Boolean = false
 
-    internal var repeat: Boolean = false
-    private var autoplay: Boolean = true
-
     internal var videoLength: Long = 0L
     internal var userVolume: Int = MAX_PLAYER_VOLUME
 
@@ -81,6 +79,22 @@ class LibVlcPlayerView(
 
         addPlayerSlaves()
 
+        if (volume != MAX_PLAYER_VOLUME) {
+            mediaPlayer!!.setVolume(volume)
+        }
+
+        if (mute) {
+            mediaPlayer!!.setVolume(MIN_PLAYER_VOLUME)
+        }
+
+        if (rate != DEFAULT_PLAYER_RATE) {
+            mediaPlayer!!.setRate(rate)
+        }
+
+        if (aspectRatio != null) {
+            mediaPlayer!!.setAspectRatio(aspectRatio)
+        }
+
         if (autoplay) {
             mediaPlayer!!.play()
         }
@@ -99,7 +113,6 @@ class LibVlcPlayerView(
         set(value) {
             val old = field
             field = value
-
             shouldCreate = value != old
         }
 
@@ -107,7 +120,6 @@ class LibVlcPlayerView(
         set(value) {
             val old = field
             field = value
-
             shouldCreate = value != old
         }
 
@@ -171,57 +183,65 @@ class LibVlcPlayerView(
             setPlayerTracks()
         }
 
-    fun setVolume(volume: Int) {
-        if (options.hasAudioOption()) {
-            val error = mapOf("error" to "Audio disabled via options")
-            onEncounteredError(error)
-        }
+    var volume: Int = MAX_PLAYER_VOLUME
+        set(value) {
+            if (options.hasAudioOption()) {
+                val error = mapOf("error" to "Audio disabled via options")
+                onEncounteredError(error)
+            }
 
-        val newVolume = volume.coerceIn(MIN_PLAYER_VOLUME, MAX_PLAYER_VOLUME)
-        userVolume = newVolume
+            field = value
 
-        mediaPlayer?.setVolume(newVolume)
-        MediaPlayerManager.audioFocusManager.updateAudioFocus()
-    }
+            val volume = value.coerceIn(MIN_PLAYER_VOLUME, MAX_PLAYER_VOLUME)
+            userVolume = volume
 
-    fun setMute(mute: Boolean) {
-        if (options.hasAudioOption()) {
-            val error = mapOf("error" to "Audio disabled via options")
-            onEncounteredError(error)
+            mediaPlayer?.setVolume(volume)
+            MediaPlayerManager.audioFocusManager.updateAudioFocus()
         }
 
-        val newVolume =
-            if (!mute) {
-                userVolume.coerceIn(PLAYER_VOLUME_STEP, MAX_PLAYER_VOLUME)
-            } else {
-                MIN_PLAYER_VOLUME
+    var mute: Boolean = false
+        set(value) {
+            if (options.hasAudioOption()) {
+                val error = mapOf("error" to "Audio disabled via options")
+                onEncounteredError(error)
             }
 
-        mediaPlayer?.setVolume(newVolume)
-        MediaPlayerManager.audioFocusManager.updateAudioFocus()
-    }
+            field = value
 
-    fun setRate(rate: Float) {
-        mediaPlayer?.setRate(rate)
-    }
+            val newVolume =
+                if (!value) {
+                    userVolume.coerceIn(PLAYER_VOLUME_STEP, MAX_PLAYER_VOLUME)
+                } else {
+                    MIN_PLAYER_VOLUME
+                }
 
-    var time: Int = DEFAULT_PLAYER_TIME
+            mediaPlayer?.setVolume(newVolume)
+            MediaPlayerManager.audioFocusManager.updateAudioFocus()
+        }
+
+    var rate: Float = DEFAULT_PLAYER_RATE
         set(value) {
             field = value
+            mediaPlayer?.setRate(value)
         }
 
-    fun setRepeat(repeat: Boolean) {
-        if (options.hasRepeatOption()) {
-            val error = mapOf("error" to "Repeat enabled via options")
-            onEncounteredError(error)
-        }
+    var time: Int = DEFAULT_PLAYER_TIME
 
-        this.repeat = repeat
-    }
+    var repeat: Boolean = false
+        set(value) {
+            if (options.hasRepeatOption()) {
+                val error = mapOf("error" to "Repeat enabled via options")
+                onEncounteredError(error)
+            }
 
-    fun setAspectRatio(aspectRatio: String?) {
-        mediaPlayer?.setAspectRatio(aspectRatio)
-    }
+            field = value
+        }
+
+    var aspectRatio: String? = null
+        set(value) {
+            field = value
+            mediaPlayer?.setAspectRatio(value)
+        }
 
     var audioMixingMode: AudioMixingMode = AudioMixingMode.AUTO
         set(value) {
@@ -235,9 +255,7 @@ class LibVlcPlayerView(
             MediaPlayerManager.audioFocusManager.updateAudioFocus()
         }
 
-    fun setAutoplay(autoplay: Boolean) {
-        this.autoplay = autoplay
-    }
+    var autoplay: Boolean = true
 
     fun play() {
         mediaPlayer?.play()

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

@@ -5,7 +5,7 @@ import expo.modules.kotlin.exception.Exceptions
 import java.lang.ref.WeakReference
 
 object MediaPlayerManager {
-    private var playerViews: MutableList<WeakReference<LibVlcPlayerView>> = mutableListOf()
+    internal var playerViews: MutableList<WeakReference<LibVlcPlayerView>> = mutableListOf()
 
     lateinit var audioFocusManager: AudioFocusManager
 
@@ -13,7 +13,7 @@ object MediaPlayerManager {
         val context = appContext.reactContext ?: throw Exceptions.ReactContextLost()
 
         if (!this::audioFocusManager.isInitialized) {
-            audioFocusManager = AudioFocusManager(appContext, playerViews)
+            audioFocusManager = AudioFocusManager(appContext)
         }
     }
 

package/ios/LibVlcPlayerModule.swift

@@ -34,55 +34,55 @@ public class LibVlcPlayerModule: Module {
             Events(playerEvents)
 
             Prop("uri") { (view: LibVlcPlayerView, uri: String) in
-                view.setUri(uri)
+                view.uri = uri
             }
 
             Prop("options") { (view: LibVlcPlayerView, options: [String]?) in
-                view.setOptions(options ?? [String]())
+                view.options = options ?? [String]()
             }
 
             Prop("slaves") { (view: LibVlcPlayerView, slaves: [[String: Any]]?) in
-                view.setSlaves(slaves)
+                view.slaves = slaves
             }
 
             Prop("tracks") { (view: LibVlcPlayerView, tracks: [String: Any]?) in
-                view.setTracks(tracks)
+                view.tracks = tracks
             }
 
             Prop("volume") { (view: LibVlcPlayerView, volume: Int?) in
-                view.setVolume(volume ?? maxPlayerVolume)
+                view.volume = volume ?? maxPlayerVolume
             }
 
             Prop("mute") { (view: LibVlcPlayerView, mute: Bool?) in
-                view.setMute(mute ?? false)
+                view.mute = mute ?? false
             }
 
             Prop("rate") { (view: LibVlcPlayerView, rate: Float?) in
-                view.setRate(rate ?? defaultPlayerRate)
+                view.rate = rate ?? defaultPlayerRate
             }
 
             Prop("time") { (view: LibVlcPlayerView, time: Int?) in
-                view.setTime(time ?? defaultPlayerTime)
+                view.time = time ?? defaultPlayerTime
             }
 
             Prop("repeat") { (view: LibVlcPlayerView, shouldRepeat: Bool?) in
-                view.setRepeat(shouldRepeat ?? false)
+                view.shouldRepeat = shouldRepeat ?? false
             }
 
             Prop("aspectRatio") { (view: LibVlcPlayerView, aspectRatio: String?) in
-                view.setAspectRatio(aspectRatio)
+                view.aspectRatio = aspectRatio
             }
 
             Prop("audioMixingMode") { (view: LibVlcPlayerView, audioMixingMode: AudioMixingMode?) in
-                view.setAudioMixingMode(audioMixingMode ?? .auto)
+                view.audioMixingMode = audioMixingMode ?? .auto
             }
 
             Prop("playInBackground") { (view: LibVlcPlayerView, playInBackground: Bool?) in
-                view.setPlayInBackground(playInBackground ?? false)
+                view.playInBackground = playInBackground ?? false
             }
 
             Prop("autoplay") { (view: LibVlcPlayerView, autoplay: Bool?) in
-                view.setAutoplay(autoplay ?? true)
+                view.autoplay = autoplay ?? true
             }
 
             OnViewDidUpdateProps { (view: LibVlcPlayerView) in

package/ios/LibVlcPlayerView.swift

@@ -4,6 +4,7 @@ import UIKit
 
 let defaultPlayerRate: Float = 1.0
 let defaultPlayerTime: Int = 0
+
 let minPlayerVolume: Int = 0
 let maxPlayerVolume: Int = 100
 let playerVolumeStep: Int = 10
@@ -12,19 +13,8 @@ class LibVlcPlayerView: ExpoView {
     private let playerView = UIView()
 
     var mediaPlayer: VLCMediaPlayer?
-
     private var shouldCreate: Bool = false
 
-    private var uri: String = ""
-    var options: [String] = .init()
-    private var slaves: [[String: Any]]?
-    private var tracks: [String: Any]?
-    var time: Int = defaultPlayerTime
-    var shouldRepeat: Bool = false
-    var audioMixingMode: AudioMixingMode = .auto
-    var playInBackground: Bool = false
-    private var autoplay: Bool = true
-
     var videoLength: Int32 = 0
     private var userVolume: Int = maxPlayerVolume
 
@@ -73,6 +63,24 @@ class LibVlcPlayerView: ExpoView {
 
         addPlayerSlaves()
 
+        if volume != maxPlayerVolume {
+            mediaPlayer!.volume = Int32(volume)
+        }
+
+        if mute {
+            mediaPlayer!.volume = Int32(minPlayerVolume)
+        }
+
+        if rate != defaultPlayerRate {
+            mediaPlayer!.rate = rate
+        }
+
+        if aspectRatio != nil {
+            aspectRatio.withCString { cString in
+                mediaPlayer!.videoAspectRatio = UnsafeMutablePointer(mutating: cString)
+            }
+        }
+
         if autoplay {
             mediaPlayer!.play()
         }
@@ -86,18 +94,16 @@ class LibVlcPlayerView: ExpoView {
         mediaPlayer = nil
     }
 
-    func setUri(_ uri: String) {
-        let old = self.uri
-        self.uri = uri
-
-        shouldCreate = uri != old
+    var uri: String = "" {
+        didSet {
+            shouldCreate = uri != oldValue
+        }
     }
 
-    func setOptions(_ options: [String]) {
-        let old = self.options
-        self.options = options
-
-        shouldCreate = options != old
+    var options: [String] = .init() {
+        didSet {
+            shouldCreate = options != oldValue
+        }
     }
 
     func addPlayerSlave(_ slave: [String: Any]) {
@@ -124,9 +130,10 @@ class LibVlcPlayerView: ExpoView {
         slaves?.filter { ($0["type"] as? String) == "audio" }.forEach { addPlayerSlave($0) }
     }
 
-    func setSlaves(_ slaves: [[String: Any]]?) {
-        self.slaves = slaves
-        addPlayerSlaves()
+    var slaves: [[String: Any]]? {
+        didSet {
+            addPlayerSlaves()
+        }
     }
 
     func setPlayerTracks() {
@@ -141,86 +148,93 @@ class LibVlcPlayerView: ExpoView {
         player.currentVideoSubTitleIndex = Int32(videoSubTitleIndex)
     }
 
-    func setTracks(_ tracks: [String: Any]?) {
-        if options.hasAudioTrackOption() {
-            let error = ["error": "Audio track selected via options"]
-            onEncounteredError(error)
-        }
+    var tracks: [String: Any]? {
+        didSet {
+            if options.hasAudioTrackOption() {
+                let error = ["error": "Audio track selected via options"]
+                onEncounteredError(error)
+            }
 
-        if options.hasSubtitleTrackOption() {
-            let error = ["error": "Subtitle track selected via options"]
-            onEncounteredError(error)
-        }
+            if options.hasSubtitleTrackOption() {
+                let error = ["error": "Subtitle track selected via options"]
+                onEncounteredError(error)
+            }
 
-        self.tracks = tracks
-        setPlayerTracks()
+            setPlayerTracks()
+        }
     }
 
-    func setVolume(_ volume: Int) {
-        if options.hasAudioOption() {
-            let error = ["error": "Audio disabled via options"]
-            onEncounteredError(error)
-        }
+    var volume: Int = maxPlayerVolume {
+        didSet {
+            if options.hasAudioOption() {
+                let error = ["error": "Audio disabled via options"]
+                onEncounteredError(error)
+            }
 
-        let newVolume = max(minPlayerVolume, min(maxPlayerVolume, volume))
-        userVolume = newVolume
+            let newVolume = max(minPlayerVolume, min(maxPlayerVolume, volume))
+            userVolume = newVolume
 
-        mediaPlayer?.audio?.volume = Int32(newVolume)
-        MediaPlayerManager.shared.setAppropriateAudioSessionOrWarn()
+            mediaPlayer?.audio?.volume = Int32(newVolume)
+            MediaPlayerManager.shared.setAppropriateAudioSessionOrWarn()
+        }
     }
 
-    func setMute(_ mute: Bool) {
-        if options.hasAudioOption() {
-            let error = ["error": "Audio disabled via options"]
-            onEncounteredError(error)
-        }
+    var mute: Bool = false {
+        didSet {
+            if options.hasAudioOption() {
+                let error = ["error": "Audio disabled via options"]
+                onEncounteredError(error)
+            }
 
-        let newVolume = !mute ?
-            max(playerVolumeStep, min(maxPlayerVolume, userVolume)) :
-            minPlayerVolume
+            let newVolume = !mute ?
+                max(playerVolumeStep, min(maxPlayerVolume, userVolume)) :
+                minPlayerVolume
 
-        mediaPlayer?.audio?.volume = Int32(newVolume)
-        MediaPlayerManager.shared.setAppropriateAudioSessionOrWarn()
+            mediaPlayer?.audio?.volume = Int32(newVolume)
+            MediaPlayerManager.shared.setAppropriateAudioSessionOrWarn()
+        }
     }
 
-    func setRate(_ rate: Float) {
-        mediaPlayer?.rate = rate
+    var rate: Float = defaultPlayerRate {
+        didSet {
+            mediaPlayer?.rate = rate
+        }
     }
 
-    func setTime(_ time: Int) {
-        self.time = time
-    }
+    var time: Int = defaultPlayerTime
 
-    func setRepeat(_ shouldRepeat: Bool) {
-        if options.hasRepeatOption() {
-            let error = ["error": "Repeat enabled via options"]
-            onEncounteredError(error)
+    var shouldRepeat: Bool = false {
+        didSet {
+            if options.hasRepeatOption() {
+                let error = ["error": "Repeat enabled via options"]
+                onEncounteredError(error)
+            }
         }
-
-        self.shouldRepeat = shouldRepeat
     }
 
-    func setAspectRatio(_ aspectRatio: String?) {
-        guard let aspectRatio = aspectRatio else { return }
+    var aspectRatio: String? {
+        didSet {
+            guard let aspectRatio = aspectRatio else { return }
 
-        aspectRatio.withCString { cString in
-            mediaPlayer?.videoAspectRatio = UnsafeMutablePointer(mutating: cString)
+            aspectRatio.withCString { cString in
+                mediaPlayer?.videoAspectRatio = UnsafeMutablePointer(mutating: cString)
+            }
         }
     }
 
-    func setAudioMixingMode(_ audioMixingMode: AudioMixingMode) {
-        self.audioMixingMode = audioMixingMode
-        MediaPlayerManager.shared.setAppropriateAudioSessionOrWarn()
+    var audioMixingMode: AudioMixingMode = .auto {
+        didSet {
+            MediaPlayerManager.shared.setAppropriateAudioSessionOrWarn()
+        }
     }
 
-    func setPlayInBackground(_ playInBackground: Bool) {
-        self.playInBackground = playInBackground
-        MediaPlayerManager.shared.setAppropriateAudioSessionOrWarn()
+    var playInBackground: Bool = false {
+        didSet {
+            MediaPlayerManager.shared.setAppropriateAudioSessionOrWarn()
+        }
     }
 
-    func setAutoplay(_ autoplay: Bool) {
-        self.autoplay = autoplay
-    }
+    var autoplay: Bool = true
 
     func play() {
         mediaPlayer?.play()

package/package.json

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