expo-libvlc-player 3.4.16 → 3.4.18

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'expo.modules.libvlcplayer'
-version = '3.4.16'
+version = '3.4.18'
 
 def expoModulesCorePlugin = new File(project(':expo-modules-core').projectDir.absolutePath, 'ExpoModulesCorePlugin.gradle')
 apply from: expoModulesCorePlugin
@@ -25,7 +25,7 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 35)
 
         versionCode 1
-        versionName '3.4.16'
+        versionName '3.4.18'
 
         consumerProguardFiles('proguard-rules.pro')
     }

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

@@ -310,10 +310,10 @@ class LibVlcPlayerView(
 
         mediaPlayer?.let { player ->
             val video = player.getCurrentVideoTrack()
-            val pLength = player.getLength()
+            val duration = player.getLength()
             val length =
-                if (pLength != -1L) {
-                    pLength
+                if (duration != -1L) {
+                    duration
                 } else {
                     0L
                 }
@@ -373,14 +373,12 @@ class LibVlcPlayerView(
 
     var source: String? = null
         set(value) {
-            val old = field
             field = value
             shouldCreate = true
         }
 
     var options: MutableList<String> = mutableListOf()
         set(value) {
-            val old = field
             field = value
             shouldCreate = true
         }
@@ -514,10 +512,6 @@ class LibVlcPlayerView(
 
     fun record(path: String?) {
         mediaPlayer?.let { player ->
-            if (!player.isPlaying()) {
-                return
-            }
-
             if (path != null) {
                 val success = player.record(path)
 
@@ -563,7 +557,7 @@ class LibVlcPlayerView(
                     Handler(Looper.getMainLooper()),
                 )
             } catch (_: Exception) {
-                onEncounteredError(mapOf("error" to "Media snapshot could not be taken"))
+                onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
             }
         }
     }
@@ -643,13 +637,9 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
                     }
 
                     Event.EncounteredError -> {
-                        onEncounteredError(mapOf("error" to "Media player encountered an error"))
-
-                        MediaPlayerManager.keepAwakeManager.deactivateKeepAwake()
-                        MediaPlayerManager.audioFocusManager.updateAudioFocus()
+                        onEncounteredError(mapOf("error" to "Player encountered an error"))
 
-                        firstPlay = true
-                        firstTime = true
+                        player.stop()
                     }
 
                     Event.TimeChanged -> {

package/ios/LibVlcPlayerView.swift

@@ -403,7 +403,7 @@ class LibVlcPlayerView: ExpoView {
     }
 
     func record(_ path: String?) {
-        if let player = mediaPlayer, player.isPlaying {
+        if let player = mediaPlayer {
             if let path {
                 // https://code.videolan.org/videolan/VLCKit/-/issues/394
                 let success = !player.startRecording(atPath: path)
@@ -421,19 +421,20 @@ class LibVlcPlayerView: ExpoView {
 
     func snapshot(_ path: String) {
         if let player = mediaPlayer {
-            let dateFormatter = DateFormatter()
-            dateFormatter.dateFormat = "yyyy-MM-dd-HH'h'mm'm'ss's'"
-            let snapshotPath = path + "/vlc-snapshot-\(dateFormatter.string(from: Date())).jpg"
-
             let video = player.videoSize
-            let width = Int32(video.width)
-            let height = Int32(video.height)
 
-            player.saveVideoSnapshot(at: snapshotPath, withWidth: width, andHeight: height)
+            if video != .zero {
+                let dateFormatter = DateFormatter()
+                dateFormatter.dateFormat = "yyyy-MM-dd-HH'h'mm'm'ss's'"
+                let snapshotPath = path + "/vlc-snapshot-\(dateFormatter.string(from: Date())).jpg"
+
+                player.saveVideoSnapshot(at: snapshotPath, withWidth: Int32(video.width), andHeight: Int32(video.height))
 
-            onSnapshotTaken(["path": snapshotPath])
-        } else {
-            onEncounteredError(["error": "Media snapshot could not be taken"])
+                onSnapshotTaken(["path": snapshotPath])
+            } else {
+                onEncounteredError(["error": "Snapshot could not be taken"])
+                return
+            }
         }
     }
 
@@ -493,13 +494,9 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                     player.play()
                 }
             case .error:
-                onEncounteredError(["error": "Media player encountered an error"])
+                onEncounteredError(["error": "Player encountered an error"])
 
-                MediaPlayerManager.shared.keepAwakeManager.deactivateKeepAwake()
-                MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
-
-                firstPlay = true
-                firstTime = true
+                player.stop()
             case .esAdded:
                 onESAdded(getMediaTracks())
             default:

package/package.json

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