expo-libvlc-player 2.0.7 → 2.0.9

package/android/build.gradle

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

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

@@ -30,8 +30,11 @@ class AudioFocusManager(
             }
 
     private fun playerRequiresFocus(player: MediaPlayer?): Boolean {
-        val mPlayer = player ?: return false
-        return mPlayer.isPlaying() && mPlayer.getVolume() > MIN_PLAYER_VOLUME
+        if (player != null) {
+            return player.isPlaying() && player.getVolume() > MIN_PLAYER_VOLUME
+        } else {
+            return false
+        }
     }
 
     private fun findAudioMixingMode(): AudioMixingMode {
@@ -177,9 +180,11 @@ class AudioFocusManager(
     }
 
     private fun pausePlayerIfUnmuted(player: MediaPlayer?) {
-        player?.let { mPlayer ->
-            if (mPlayer.getVolume() > MIN_PLAYER_VOLUME) {
-                mPlayer.pause()
+        if (player != null) {
+            val unmuted = player.getVolume() > MIN_PLAYER_VOLUME
+
+            if (unmuted) {
+                player.pause()
             }
         }
     }

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

@@ -17,6 +17,7 @@ import org.videolan.libvlc.MediaPlayer
 import org.videolan.libvlc.interfaces.IMedia
 import org.videolan.libvlc.util.DisplayManager
 import org.videolan.libvlc.util.VLCVideoLayout
+import java.net.URI
 
 const val DEFAULT_PLAYER_RATE: Float = 1f
 const val DEFAULT_PLAYER_TIME: Int = 0
@@ -81,19 +82,25 @@ class LibVlcPlayerView(
         }
 
         destroyPlayer()
+
+        val source = source ?: return
+
         libVLC = LibVLC(context, options)
         mediaPlayer = MediaPlayer(libVLC)
         setMediaPlayerListener()
 
         try {
-            media = Media(libVLC, Uri.parse(source))
-            mediaPlayer!!.setMedia(media)
-            media!!.release()
+            URI(source)
         } catch (_: Exception) {
             val error = mapOf("error" to "Invalid source, media could not be set")
             onEncounteredError(error)
+            return
         }
 
+        media = Media(libVLC, Uri.parse(source))
+        mediaPlayer!!.setMedia(media)
+        media!!.release()
+
         addPlayerSlaves()
 
         if (autoplay) {
@@ -133,6 +140,42 @@ class LibVlcPlayerView(
         libVLC = null
     }
 
+    fun setPlayerTracks() {
+        mediaPlayer?.let { player ->
+            val audioTrack = tracks?.audio ?: player.getAudioTrack()
+            val videoTrack = tracks?.video ?: player.getVideoTrack()
+            val spuTrack = tracks?.subtitle ?: player.getSpuTrack()
+
+            player.setAudioTrack(audioTrack)
+            player.setVideoTrack(videoTrack)
+            player.setSpuTrack(spuTrack)
+        }
+    }
+
+    fun addPlayerSlaves() {
+        slaves.forEach { slave ->
+            val source = slave.source
+            val type = slave.type
+            val slaveType =
+                if (type == "subtitle") {
+                    IMedia.Slave.Type.Subtitle
+                } else {
+                    IMedia.Slave.Type.Audio
+                }
+            val selected = slave.selected ?: false
+
+            try {
+                URI(source)
+            } catch (_: Exception) {
+                val error = mapOf("error" to "Invalid slave, $type could not be added")
+                onEncounteredError(error)
+                return@forEach
+            }
+
+            mediaPlayer?.addSlave(slaveType, Uri.parse(source), selected)
+        }
+    }
+
     fun getMediaTracks(): MediaTracks {
         var mediaTracks = MediaTracks()
 
@@ -172,39 +215,6 @@ class LibVlcPlayerView(
         return mediaTracks
     }
 
-    fun setPlayerTracks() {
-        mediaPlayer?.let { player ->
-            val audioTrack = tracks?.audio ?: player.getAudioTrack()
-            val videoTrack = tracks?.video ?: player.getVideoTrack()
-            val spuTrack = tracks?.subtitle ?: player.getSpuTrack()
-
-            player.setAudioTrack(audioTrack)
-            player.setVideoTrack(videoTrack)
-            player.setSpuTrack(spuTrack)
-        }
-    }
-
-    fun addPlayerSlaves() {
-        slaves.forEach { slave ->
-            val type = slave.type
-            val slaveType =
-                if (type == "subtitle") {
-                    IMedia.Slave.Type.Subtitle
-                } else {
-                    IMedia.Slave.Type.Audio
-                }
-            val source = slave.source
-            val selected = slave.selected ?: false
-
-            try {
-                mediaPlayer?.addSlave(slaveType, Uri.parse(source), selected)
-            } catch (_: Exception) {
-                val error = mapOf("error" to "Invalid slave, $type could not be added")
-                onEncounteredError(error)
-            }
-        }
-    }
-
     fun getMediaInfo(): MediaInfo {
         var mediaInfo = MediaInfo()
 
@@ -274,22 +284,14 @@ class LibVlcPlayerView(
         set(value) {
             val old = field
             field = value
-
-            if (value != null) {
-                shouldCreate = value != old
-            } else {
-                destroyPlayer()
-            }
+            shouldCreate = value != old
         }
 
     var options: ArrayList<String> = ArrayList()
         set(value) {
             val old = field
             field = value
-
-            if (source != null) {
-                shouldCreate = value != old
-            }
+            shouldCreate = value != old
         }
 
     var tracks: Tracks? = null
@@ -409,8 +411,7 @@ class LibVlcPlayerView(
             if (player.isSeekable()) {
                 player.setPosition(position)
             } else {
-                val time = position * mediaLength.toFloat()
-                this.time = time.toInt()
+                time = (position * mediaLength.toFloat()).toInt()
             }
         }
     }

package/ios/LibVlcPlayerView.swift

@@ -56,11 +56,14 @@ class LibVlcPlayerView: ExpoView {
         }
 
         destroyPlayer()
+
+        guard let source = source else { return }
+
         mediaPlayer = VLCMediaPlayer(options: options)
         mediaPlayer!.drawable = playerView
         mediaPlayer!.delegate = self
 
-        guard let source = source, let url = URL(string: source) else {
+        guard let url = URL(string: source) else {
             let error = ["error": "Invalid source, media could not be set"]
             onEncounteredError(error)
             return
@@ -85,6 +88,37 @@ class LibVlcPlayerView: ExpoView {
         mediaPlayer = nil
     }
 
+    func setPlayerTracks() {
+        if let player = mediaPlayer {
+            let audioTrackIndex = tracks?.audio ?? Int(player.currentAudioTrackIndex)
+            let videoTrackIndex = tracks?.video ?? Int(player.currentVideoTrackIndex)
+            let videoSubTitleIndex = tracks?.subtitle ?? Int(player.currentVideoSubTitleIndex)
+
+            player.currentAudioTrackIndex = Int32(audioTrackIndex)
+            player.currentVideoTrackIndex = Int32(videoTrackIndex)
+            player.currentVideoSubTitleIndex = Int32(videoSubTitleIndex)
+        }
+    }
+
+    func addPlayerSlaves() {
+        for slave in slaves {
+            let source = slave.source
+            let type = slave.type
+            let slaveType = type == "subtitle" ?
+                VLCMediaPlaybackSlaveType.subtitle :
+                VLCMediaPlaybackSlaveType.audio
+            let selected = slave.selected ?? false
+
+            guard let url = URL(string: source) else {
+                let error = ["error": "Invalid slave, \(type) could not be added"]
+                onEncounteredError(error)
+                continue
+            }
+
+            mediaPlayer?.addPlaybackSlave(url, type: slaveType, enforce: selected)
+        }
+    }
+
     func getMediaTracks() -> MediaTracks {
         var mediaTracks = MediaTracks()
 
@@ -135,37 +169,6 @@ class LibVlcPlayerView: ExpoView {
         return mediaTracks
     }
 
-    func setPlayerTracks() {
-        guard let player = mediaPlayer else { return }
-
-        let audioTrackIndex = tracks?.audio ?? Int(player.currentAudioTrackIndex)
-        let videoTrackIndex = tracks?.video ?? Int(player.currentVideoTrackIndex)
-        let videoSubTitleIndex = tracks?.subtitle ?? Int(player.currentVideoSubTitleIndex)
-
-        player.currentAudioTrackIndex = Int32(audioTrackIndex)
-        player.currentVideoTrackIndex = Int32(videoTrackIndex)
-        player.currentVideoSubTitleIndex = Int32(videoSubTitleIndex)
-    }
-
-    func addPlayerSlaves() {
-        for slave in slaves {
-            let source = slave.source
-            let type = slave.type
-            let slaveType = type == "subtitle" ?
-                VLCMediaPlaybackSlaveType.subtitle :
-                VLCMediaPlaybackSlaveType.audio
-            let selected = slave.selected ?? false
-
-            guard let url = URL(string: source) else {
-                let error = ["error": "Invalid slave, \(type) could not be added"]
-                onEncounteredError(error)
-                continue
-            }
-
-            mediaPlayer?.addPlaybackSlave(url, type: slaveType, enforce: selected)
-        }
-    }
-
     func getMediaInfo() -> MediaInfo {
         var mediaInfo = MediaInfo()
 
@@ -190,54 +193,48 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func setupPlayer() {
-        guard let player = mediaPlayer else { return }
-
-        setPlayerTracks()
+        if let player = mediaPlayer {
+            setPlayerTracks()
 
-        if volume != maxPlayerVolume || mute {
-            let newVolume = mute ?
-                minPlayerVolume :
-                volume
+            if volume != maxPlayerVolume || mute {
+                let newVolume = mute ?
+                    minPlayerVolume :
+                    volume
 
-            player.audio?.volume = Int32(newVolume)
-        }
+                player.audio?.volume = Int32(newVolume)
+            }
 
-        if rate != defaultPlayerRate {
-            player.rate = rate
-        }
+            if rate != defaultPlayerRate {
+                player.rate = rate
+            }
 
-        if time != defaultPlayerTime {
-            player.time = VLCTime(int: Int32(time))
-        }
+            if time != defaultPlayerTime {
+                player.time = VLCTime(int: Int32(time))
+            }
 
-        if scale != defaultPlayerScale {
-            player.scaleFactor = scale
-        }
+            if scale != defaultPlayerScale {
+                player.scaleFactor = scale
+            }
 
-        if let aspectRatio = aspectRatio {
-            aspectRatio.withCString { cString in
-                player.videoAspectRatio = UnsafeMutablePointer(mutating: cString)
+            if let aspectRatio = aspectRatio {
+                aspectRatio.withCString { cString in
+                    player.videoAspectRatio = UnsafeMutablePointer(mutating: cString)
+                }
             }
-        }
 
-        time = defaultPlayerTime
+            time = defaultPlayerTime
+        }
     }
 
     var source: String? {
         didSet {
-            if source != nil {
-                shouldCreate = source != oldValue
-            } else {
-                destroyPlayer()
-            }
+            shouldCreate = source != oldValue
         }
     }
 
     var options: [String] = .init() {
         didSet {
-            if source != nil {
-                shouldCreate = options != oldValue
-            }
+            shouldCreate = options != oldValue
         }
     }
 
@@ -270,13 +267,12 @@ class LibVlcPlayerView: ExpoView {
 
     var aspectRatio: String? {
         didSet {
-            guard let aspectRatio = aspectRatio else {
+            if let aspectRatio = aspectRatio {
+                aspectRatio.withCString { cString in
+                    mediaPlayer?.videoAspectRatio = UnsafeMutablePointer(mutating: cString)
+                }
+            } else {
                 mediaPlayer?.videoAspectRatio = nil
-                return
-            }
-
-            aspectRatio.withCString { cString in
-                mediaPlayer?.videoAspectRatio = UnsafeMutablePointer(mutating: cString)
             }
         }
     }
@@ -359,13 +355,12 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func seek(_ position: Float) {
-        guard let player = mediaPlayer else { return }
-
-        if player.isSeekable {
-            player.position = position
-        } else {
-            let time = position * Float(mediaLength)
-            self.time = Int(time)
+        if let player = mediaPlayer {
+            if player.isSeekable {
+                player.position = position
+            } else {
+                time = Int(position * Float(mediaLength))
+            }
         }
     }
 }

package/ios/MediaPlayerDelegate.swift

@@ -2,58 +2,58 @@ import MobileVLCKit
 
 extension LibVlcPlayerView: VLCMediaPlayerDelegate {
     func mediaPlayerStateChanged(_: Notification) {
-        guard let player = mediaPlayer else { return }
-
-        switch player.state {
-        case .buffering:
-            onBuffering([:])
-        case .playing:
-            onPlaying([:])
-
-            if firstPlay {
-                setupPlayer()
-
-                let mediaInfo = getMediaInfo()
-
-                onFirstPlay(mediaInfo)
-
-                firstPlay = false
-            }
-
-            MediaPlayerManager.shared.setAppropriateAudioSession()
-        case .paused:
-            onPaused([:])
-        case .stopped:
-            onStopped([:])
-
-            firstPlay = true
-        case .ended:
-            onEndReached([:])
-
-            player.stop()
-
-            let shouldReplay = !options.hasRepeatOption() && shouldRepeat
-
-            if shouldReplay {
-                player.play()
+        if let player = mediaPlayer {
+            switch player.state {
+            case .buffering:
+                onBuffering([:])
+            case .playing:
+                onPlaying([:])
+
+                if firstPlay {
+                    setupPlayer()
+
+                    let mediaInfo = getMediaInfo()
+
+                    onFirstPlay(mediaInfo)
+
+                    firstPlay = false
+                }
+
+                MediaPlayerManager.shared.setAppropriateAudioSession()
+            case .paused:
+                onPaused([:])
+            case .stopped:
+                onStopped([:])
+
+                firstPlay = true
+            case .ended:
+                onEndReached([:])
+
+                player.stop()
+
+                let shouldReplay = !options.hasRepeatOption() && shouldRepeat
+
+                if shouldReplay {
+                    player.play()
+                }
+            case .error:
+                let error = ["error": "Player encountered an error"]
+                onEncounteredError(error)
+            case .esAdded:
+                if !firstPlay {
+                    let mediaTracks = getMediaTracks()
+                    onESAdded(mediaTracks)
+                }
+            default:
+                break
             }
-        case .error:
-            let error = ["error": "Player encountered an error"]
-            onEncounteredError(error)
-        case .esAdded:
-            if !firstPlay {
-                let mediaTracks = getMediaTracks()
-                onESAdded(mediaTracks)
-            }
-        default:
-            break
         }
     }
 
     func mediaPlayerTimeChanged(_: Notification) {
-        guard let player = mediaPlayer else { return }
-
-        let position = ["position": player.position]
-        onPositionChanged(position)
+        if let player = mediaPlayer {
+            let position = ["position": player.position]
+            onPositionChanged(position)
+        }
     }
 }

package/ios/MediaPlayerManager.swift

@@ -27,12 +27,12 @@ class MediaPlayerManager {
         for view in playerViews.allObjects {
             view.onBackground([:])
 
-            guard let player = view.mediaPlayer else { continue }
+            if let player = view.mediaPlayer {
+                let shouldPause = !view.playInBackground && player.isPlaying
 
-            let shouldPause = !view.playInBackground && player.isPlaying
-
-            if shouldPause {
-                player.pause()
+                if shouldPause {
+                    player.pause()
+                }
             }
         }
     }
@@ -49,8 +49,11 @@ class MediaPlayerManager {
         var audioSessionCategoryOptions: AVAudioSession.CategoryOptions = audioSession.categoryOptions
 
         let isOutputtingAudio = playerViews.allObjects.contains { view in
-            guard let player = view.mediaPlayer, let audio = player.audio else { return false }
-            return player.isPlaying && audio.volume > minPlayerVolume
+            if let player = view.mediaPlayer, let audio = player.audio {
+                return player.isPlaying && audio.volume > minPlayerVolume
+            } else {
+                return false
+            }
         }
 
         let shouldMixOverride = audioMixingMode == .mixWithOthers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -20,7 +20,7 @@
     "libvlc",
     "player",
     "expo-libvlc-player",
-    "ExpoLibVlcPlayer"
+    "ExpoLibvlcPlayer"
   ],
   "repository": "https://github.com/cornejobarraza/expo-libvlc-player",
   "bugs": {