expo-libvlc-player 6.1.17 → 6.1.18

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

@@ -112,48 +112,20 @@ class LibVlcPlayerView(
 
     fun getTextureView(layout: VLCVideoLayout): TextureView? = layout.findViewById(org.videolan.R.id.texture_video)
 
-    fun initPlayer() {
-        if (shouldInit) {
-            destroyPlayer()
+    fun addPlayerLayout(view: VLCVideoLayout) {
+        val parent = playerLayout.parent as? ViewGroup
 
-            if (source != null) {
-                createPlayer()
-            }
+        if (parent == null) {
+            addView(view)
         }
     }
 
-    fun createPlayer() {
-        var args = options
-        args.toggleStartPausedOption(autoplay)
-
-        if (pictureInPicture) {
-            MediaPlayerManager.pictureInPictureManager.setupPipView(this)
-        }
-
-        libVLC = LibVLC(context, args)
-        setDialogCallbacks(libVLC!!)
-
-        mediaPlayer = MediaPlayer(libVLC!!)
-        attachPlayerLayout(playerLayout)
-        setPlayerListener(mediaPlayer!!)
-        setupPlayer()
+    fun removePlayerLayout() {
+        val parent = playerLayout.parent as? ViewGroup
 
-        try {
-            URI(source)
-        } catch (_: Exception) {
-            onEncounteredError(mapOf("error" to "Invalid source, media could not be set"))
-            return
+        if (parent != null) {
+            removeView(playerLayout)
         }
-
-        val media = Media(libVLC!!, Uri.parse(source!!))
-        mediaPlayer!!.setMedia(media)
-        media.release()
-        mediaPlayer!!.play()
-
-        firstPlay = true
-        shouldInit = false
-
-        addPlayerLayout(playerLayout)
     }
 
     fun resetPlayer() {
@@ -191,20 +163,48 @@ class LibVlcPlayerView(
         }
     }
 
-    fun addPlayerLayout(view: VLCVideoLayout) {
-        val parent = playerLayout.parent as? ViewGroup
+    fun initPlayer() {
+        if (shouldInit) {
+            destroyPlayer()
 
-        if (parent == null) {
-            addView(view)
+            if (source != null) {
+                createPlayer()
+            }
         }
     }
 
-    fun removePlayerLayout() {
-        val parent = playerLayout.parent as? ViewGroup
+    fun createPlayer() {
+        var args = options
+        args.toggleStartPausedOption(autoplay)
 
-        if (parent != null) {
-            removeView(playerLayout)
+        if (pictureInPicture) {
+            MediaPlayerManager.pictureInPictureManager.setupPipView(this)
         }
+
+        libVLC = LibVLC(context, args)
+        setDialogCallbacks(libVLC!!)
+
+        mediaPlayer = MediaPlayer(libVLC!!)
+        attachPlayerLayout(playerLayout)
+        setPlayerListener(mediaPlayer!!)
+        setupPlayer()
+
+        try {
+            URI(source)
+        } catch (_: Exception) {
+            onEncounteredError(mapOf("error" to "Invalid source, media could not be set"))
+            return
+        }
+
+        val media = Media(libVLC!!, Uri.parse(source!!))
+        mediaPlayer!!.setMedia(media)
+        media.release()
+        mediaPlayer!!.play()
+
+        firstPlay = true
+        shouldInit = false
+
+        addPlayerLayout(playerLayout)
     }
 
     fun destroyPlayer() {
@@ -277,7 +277,7 @@ class LibVlcPlayerView(
             try {
                 URI(source)
             } catch (_: Exception) {
-                onEncounteredError(mapOf("error" to "Invalid slave, $type could not be added"))
+                onEncounteredError(mapOf("error" to "Invalid source, $type could not be added"))
                 return@forEach
             }
 
@@ -444,11 +444,7 @@ class LibVlcPlayerView(
 
     fun getVideoSize(): Size {
         val video = mediaPlayer?.getCurrentVideoTrack()
-
-        if (video != null) {
-            return Size(video.width, video.height)
-        }
-
+        if (video != null) return Size(video.width, video.height)
         return Size(0, 0)
     }
 
@@ -642,8 +638,6 @@ class LibVlcPlayerView(
 
                 if (!success) {
                     onEncounteredError(mapOf("error" to "Media could not be recorded"))
-
-                    player.record(null)
                 }
             } else {
                 player.record(null)
@@ -665,12 +659,9 @@ class LibVlcPlayerView(
                 surface,
                 bitmap,
                 { copyResult ->
-                    if (copyResult != PixelCopy.SUCCESS) {
-                        onEncounteredError(mapOf("error" to "Snapshot could not be taken"))
-                        return@request
-                    }
-
                     try {
+                        if (copyResult != PixelCopy.SUCCESS) throw Exception()
+
                         val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd-HH'h'mm'm'ss's'")
                         val timestamp = simpleDateFormat.format(Calendar.getInstance().time)
 
@@ -781,6 +772,14 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                                     return@retryUntil hasVideoSize
                                 }
 
+                                retryUntil { isLastAttempt ->
+                                    if (hasAudioOut) {
+                                        MediaPlayerManager.audioFocusManager.updateAudioFocus()
+                                    }
+
+                                    return@retryUntil hasAudioOut
+                                }
+
                                 firstPlay = false
                             }
                         }
@@ -801,16 +800,9 @@ fun LibVlcPlayerView.setPlayerListener(mediaPlayer: MediaPlayer?) {
                             }
                         }
 
-                        MediaPlayerManager.pictureInPictureManager.setPipActions()
                         MediaPlayerManager.keepAwakeManager.toggleKeepAwake()
-
-                        retryUntil { isLastAttempt ->
-                            if (hasAudioOut) {
-                                MediaPlayerManager.audioFocusManager.updateAudioFocus()
-                            }
-
-                            return@retryUntil hasAudioOut
-                        }
+                        MediaPlayerManager.audioFocusManager.updateAudioFocus()
+                        MediaPlayerManager.pictureInPictureManager.setPipActions()
                     }
 
                     Event.EndReached -> {

package/ios/LibVlcPlayerView.swift

@@ -167,7 +167,7 @@ class LibVlcPlayerView: ExpoView {
             let selected = slave.selected ?? false
 
             guard let url = URL(string: source) else {
-                onEncounteredError(["error": "Invalid slave, \(type) could not be added"])
+                onEncounteredError(["error": "Invalid source, \(type) could not be added"])
                 continue
             }
 
@@ -247,18 +247,6 @@ class LibVlcPlayerView: ExpoView {
         }
     }
 
-    func getMediaLength() -> Int32 {
-        var length: Int32 = 0
-
-        let duration = mediaPlayer?.media?.length.intValue ?? 0
-
-        if duration > 0 {
-            length = duration
-        }
-
-        return length
-    }
-
     func getMediaTracks() -> MediaTracks {
         var mediaTracks = MediaTracks()
 
@@ -291,6 +279,18 @@ class LibVlcPlayerView: ExpoView {
         return mediaTracks
     }
 
+    func getMediaLength() -> Int32 {
+        var length: Int32 = 0
+
+        let duration = mediaPlayer?.media?.length.intValue ?? 0
+
+        if duration > 0 {
+            length = duration
+        }
+
+        return length
+    }
+
     func getMediaInfo() -> MediaInfo {
         var mediaInfo = MediaInfo()
 
@@ -613,6 +613,16 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                             return hasVideoSize
                         }
 
+                        retryUntil { [weak self] _ in
+                            guard let self else { return true }
+
+                            if hasAudioOut {
+                                MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
+                            }
+
+                            return hasAudioOut
+                        }
+
                         firstPlay = false
                     }
                 }
@@ -631,18 +641,9 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
                     }
                 }
 
-                pictureDrawable.updatePipState()
                 MediaPlayerManager.shared.keepAwakeManager.toggleKeepAwake()
-
-                retryUntil { [weak self] _ in
-                    guard let self else { return true }
-
-                    if hasAudioOut {
-                        MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
-                    }
-
-                    return hasAudioOut
-                }
+                MediaPlayerManager.shared.audioSessionManager.setAppropriateAudioSession()
+                pictureDrawable.updatePipState()
             case .error:
                 onEncounteredError(["error": "Player encountered an error"])
 

package/ios/Utils/MediaPlayerDrawable.swift

@@ -1,9 +1,9 @@
 class MediaPlayerDrawable: UIView {
     init() {
         super.init(frame: .zero)
-        isUserInteractionEnabled = false
-        autoresizingMask = [.flexibleWidth, .flexibleHeight]
         backgroundColor = .black
+        autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        isUserInteractionEnabled = false
     }
 
     @available(*, unavailable)

package/ios/Utils/PictureInPictureDrawable.swift

@@ -1,6 +1,5 @@
 import AVKit
 import ExpoModulesCore
-import UIKit
 import VLCKit
 
 class PictureInPictureDrawable: MediaPlayerDrawable {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libvlc-player",
-  "version": "6.1.17",
+  "version": "6.1.18",
   "description": "LibVLC Player for Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -39,7 +39,7 @@
     "@eslint/js": "^9.39.4",
     "@types/react": "~19.2.10",
     "eslint": "^9.39.4",
-    "expo": "~55.0.12",
+    "expo": "~55.0.13",
     "expo-module-scripts": "^55.0.2",
     "globals": "^16.5.0",
     "husky": "^9.1.7",

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "extends": "expo-module-scripts/tsconfig.base",
   "compilerOptions": {
+    "rootDir": "./src",
     "outDir": "./build"
   },
   "include": ["./src"],