expo-libvlc-player 3.4.2 → 3.4.3

package/android/build.gradle

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

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

@@ -121,8 +121,7 @@ class LibVlcPlayerView(
         try {
             URI(source)
         } catch (_: Exception) {
-            val error = mapOf("error" to "Invalid source, media could not be set")
-            onEncounteredError(error)
+            onEncounteredError(mapOf("error" to "Invalid source, media could not be set"))
             return
         }
 
@@ -195,8 +194,7 @@ class LibVlcPlayerView(
             try {
                 URI(source)
             } catch (_: Exception) {
-                val error = mapOf("error" to "Invalid slave, $type could not be added")
-                onEncounteredError(error)
+                onEncounteredError(mapOf("error" to "Invalid slave, $type could not be added"))
                 return@forEach
             }
 
@@ -425,8 +423,7 @@ class LibVlcPlayerView(
             field = value
 
             if (options.hasAudioOption()) {
-                val error = mapOf("error" to "Audio disabled via options")
-                onEncounteredError(error)
+                onEncounteredError(mapOf("error" to "Audio disabled via options"))
             }
 
             val newVolume = value.coerceIn(MIN_PLAYER_VOLUME, MAX_PLAYER_VOLUME)
@@ -443,8 +440,7 @@ class LibVlcPlayerView(
             field = value
 
             if (options.hasAudioOption()) {
-                val error = mapOf("error" to "Audio disabled via options")
-                onEncounteredError(error)
+                onEncounteredError(mapOf("error" to "Audio disabled via options"))
             }
 
             val newVolume =
@@ -475,8 +471,7 @@ class LibVlcPlayerView(
             field = value
 
             if (options.hasRepeatOption()) {
-                val error = mapOf("error" to "Repeat enabled via options")
-                onEncounteredError(error)
+                onEncounteredError(mapOf("error" to "Repeat enabled via options"))
             }
         }
 
@@ -538,8 +533,7 @@ class LibVlcPlayerView(
                 val success = player.record(path)
 
                 if (!success) {
-                    val error = mapOf("error" to "Media could not be recorded")
-                    onEncounteredError(error)
+                    onEncounteredError(mapOf("error" to "Media could not be recorded"))
 
                     player.record(null)
                 }
@@ -575,14 +569,12 @@ class LibVlcPlayerView(
                             bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream)
                         }
 
-                        val path = mapOf("path" to snapshotPath)
-                        onSnapshotTaken(path)
+                        onSnapshotTaken(mapOf("path" to snapshotPath))
                     },
                     Handler(Looper.getMainLooper()),
                 )
             } catch (_: Exception) {
-                val error = mapOf("error" to "Media snapshot could not be taken")
-                onEncounteredError(error)
+                onEncounteredError(mapOf("error" to "Media snapshot could not be taken"))
             }
         }
     }

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

@@ -21,9 +21,7 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
 
                             setupPlayer()
 
-                            val mediaInfo = getMediaInfo()
-
-                            onFirstPlay(mediaInfo)
+                            onFirstPlay(getMediaInfo())
 
                             firstPlay = false
                         }
@@ -64,8 +62,7 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
                     }
 
                     Event.EncounteredError -> {
-                        val error = mapOf("error" to "Media player encountered an error")
-                        onEncounteredError(error)
+                        onEncounteredError(mapOf("error" to "Media player encountered an error"))
 
                         MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
                         MediaPlayerManager.audioFocusManager.updateAudioFocus()
@@ -75,14 +72,11 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
                     }
 
                     Event.TimeChanged -> {
-                        val time = mapOf("time" to player.getTime().toInt())
-                        onTimeChanged(time)
+                        onTimeChanged(mapOf("time" to player.getTime().toInt()))
 
                         if (firstTime) {
                             if (mediaLength == 0L) {
-                                val mediaInfo = getMediaInfo()
-
-                                onFirstPlay(mediaInfo)
+                                onFirstPlay(getMediaInfo())
                             }
 
                             setContentFit()
@@ -94,25 +88,18 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
                     }
 
                     Event.PositionChanged -> {
-                        val position = mapOf("position" to player.getPosition())
-                        onPositionChanged(position)
+                        onPositionChanged(mapOf("position" to player.getPosition()))
                     }
 
                     Event.ESAdded -> {
-                        val mediaTracks = getMediaTracks()
-                        onESAdded(mediaTracks)
+                        onESAdded(getMediaTracks())
                     }
 
                     Event.RecordChanged -> {
-                        var recording = Recording()
-
-                        val path = event.getRecordPath()
-                        val isRecording = event.getRecording()
-
-                        recording =
+                        val recording =
                             Recording(
-                                path = path,
-                                isRecording = isRecording,
+                                path = event.getRecordPath(),
+                                isRecording = event.getRecording(),
                             )
 
                         onRecordChanged(recording)

package/ios/AudioSessionManager.swift

@@ -19,7 +19,6 @@ extension MediaPlayerManager {
         let isOutputtingAudio = playerViews.allObjects.contains { view in
             guard let player = view.mediaPlayer else { return false }
             guard let audio = player.audio else { return false }
-
             return player.isPlaying && audio.volume > minPlayerVolume
         }
 

package/ios/LibVlcPlayerView.swift

@@ -90,8 +90,7 @@ class LibVlcPlayerView: ExpoView {
         vlcDialog!.customRenderer = self
 
         guard let url = URL(string: source) else {
-            let error = ["error": "Invalid source, media could not be set"]
-            onEncounteredError(error)
+            onEncounteredError(["error": "Invalid source, media could not be set"])
             return
         }
 
@@ -135,8 +134,7 @@ class LibVlcPlayerView: ExpoView {
             let selected = slave.selected ?? false
 
             guard let url = URL(string: source) else {
-                let error = ["error": "Invalid slave, \(type) could not be added"]
-                onEncounteredError(error)
+                onEncounteredError(["error": "Invalid slave, \(type) could not be added"])
                 continue
             }
 
@@ -350,8 +348,7 @@ class LibVlcPlayerView: ExpoView {
     var volume: Int = maxPlayerVolume {
         didSet {
             if options.hasAudioOption() {
-                let error = ["error": "Audio disabled via options"]
-                onEncounteredError(error)
+                onEncounteredError(["error": "Audio disabled via options"])
             }
 
             let newVolume = max(minPlayerVolume, min(maxPlayerVolume, volume))
@@ -367,8 +364,7 @@ class LibVlcPlayerView: ExpoView {
     var mute: Bool = false {
         didSet {
             if options.hasAudioOption() {
-                let error = ["error": "Audio disabled via options"]
-                onEncounteredError(error)
+                onEncounteredError(["error": "Audio disabled via options"])
             }
 
             let newVolume = mute ?
@@ -391,8 +387,7 @@ class LibVlcPlayerView: ExpoView {
     var shouldRepeat: Bool = false {
         didSet {
             if options.hasRepeatOption() {
-                let error = ["error": "Repeat enabled via options"]
-                onEncounteredError(error)
+                onEncounteredError(["error": "Repeat enabled via options"])
             }
         }
     }
@@ -448,8 +443,7 @@ class LibVlcPlayerView: ExpoView {
                 let success = !player.startRecording(atPath: path)
 
                 if !success {
-                    let error = ["error": "Media could not be recorded"]
-                    onEncounteredError(error)
+                    onEncounteredError(["error": "Media could not be recorded"])
 
                     player.stopRecording()
                 }
@@ -471,11 +465,9 @@ class LibVlcPlayerView: ExpoView {
 
             player.saveVideoSnapshot(at: snapshotPath, withWidth: width, andHeight: height)
 
-            let path = ["path": snapshotPath]
-            onSnapshotTaken(path)
+            onSnapshotTaken(["path": snapshotPath])
         } else {
-            let error = ["error": "Media snapshot could not be taken"]
-            onEncounteredError(error)
+            onEncounteredError(["error": "Media snapshot could not be taken"])
         }
     }
 

package/ios/MediaPlayerDelegate.swift

@@ -16,9 +16,7 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                 if firstPlay {
                     setupPlayer()
 
-                    let mediaInfo = getMediaInfo()
-
-                    onFirstPlay(mediaInfo)
+                    onFirstPlay(getMediaInfo())
 
                     firstPlay = false
                 }
@@ -49,8 +47,7 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                     player.play()
                 }
             case .error:
-                let error = ["error": "Media player encountered an error"]
-                onEncounteredError(error)
+                onEncounteredError(["error": "Media player encountered an error"])
 
                 MediaPlayerManager.shared.deactivateKeepAwake()
                 MediaPlayerManager.shared.setAppropriateAudioSession()
@@ -58,8 +55,7 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                 firstPlay = true
                 firstTime = true
             case .esAdded:
-                let mediaTracks = getMediaTracks()
-                onESAdded(mediaTracks)
+                onESAdded(getMediaTracks())
             default:
                 break
             }
@@ -68,14 +64,11 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
 
     func mediaPlayerTimeChanged(_: Notification) {
         if let player = mediaPlayer {
-            let time = ["time": player.time.intValue]
-            onTimeChanged(time)
+            onTimeChanged(["time": player.time.intValue])
 
             if firstTime {
                 if mediaLength == 0 {
-                    let mediaInfo = getMediaInfo()
-
-                    onFirstPlay(mediaInfo)
+                    onFirstPlay(getMediaInfo())
                 }
 
                 setContentFit()
@@ -85,15 +78,12 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                 firstTime = false
             }
 
-            let position = ["position": player.position]
-            onPositionChanged(position)
+            onPositionChanged(["position": player.position])
         }
     }
 
     func mediaPlayerStartedRecording(_: VLCMediaPlayer) {
-        var recording = Recording()
-
-        recording = Recording(
+        let recording = Recording(
             path: nil,
             isRecording: true,
         )
@@ -102,9 +92,7 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
     }
 
     func mediaPlayer(_: VLCMediaPlayer, recordingStoppedAtPath path: String) {
-        var recording = Recording()
-
-        recording = Recording(
+        let recording = Recording(
             path: path,
             isRecording: false,
         )

package/package.json

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