expo-libmpv 0.5.6 → 0.5.8

package/android/src/main/java/com/libmpv/LibmpvRenderer.kt

@@ -284,10 +284,7 @@ class LibmpvRenderer(
     }
 
     private fun maybeStartPlayback() {
-        if (state != State.ACTIVE) {
-            return
-        }
-        if (!surfaceAttached) {
+        if (state != State.ACTIVE || !surfaceAttached) {
             return
         }
 
@@ -298,12 +295,27 @@ class LibmpvRenderer(
 
         try {
             loadedUrl = url
-            MPVLib.command(arrayOf("loadfile", url, "replace"))
+            MPVLib.setOptionString("start", "0")
+
+            val start = session.seekToSeconds
+            if (start != null) {
+                MPVLib.setOptionString("start", start.toLong().toString())
+            }
+
+            MPVLib.command(
+                arrayOf(
+                    "loadfile",
+                    url,
+                    "replace"
+                )
+            )
+
         } catch (e: Exception) {
             logException(e)
         }
     }
 
+
     private fun applyContinuousState() {
         if (!mpvAlive || shuttingDown) {
             return
@@ -322,20 +334,6 @@ class LibmpvRenderer(
             return
         }
 
-        session.seekToSeconds?.let { target ->
-            if (session.needsApply(LibmpvSession.MpvIntent.SEEK)) {
-                val seekable = MPVLib.getPropertyBoolean("seekable") == true
-
-                if (seekable && surfaceAttached && state == State.ACTIVE) {
-                    MPVLib.command(arrayOf("set", "pause", "yes"))
-                    MPVLib.command(arrayOf("seek", target.toString(), "absolute"))
-                    MPVLib.command(arrayOf("set", "pause", if (session.isPlaying) "no" else "yes"))
-                    session.markApplied(LibmpvSession.MpvIntent.SEEK)
-                }
-            }
-        }
-
-
         session.selectedAudioTrack?.let {
             if (session.needsApply(LibmpvSession.MpvIntent.AUDIO_TRACK)) {
                 val aid = if (it == -1) "no" else (it + 1).toString()
@@ -355,6 +353,24 @@ class LibmpvRenderer(
                 session.markApplied(LibmpvSession.MpvIntent.SUBTITLE_TRACK)
             }
         }
+
+        if (session.needsApply(LibmpvSession.MpvIntent.SEEK)) {
+            val target = session.seekToSeconds
+            if (target != null) {
+                if (!session.hasFileLoaded) {
+                    return
+                }
+                MPVLib.command(
+                    arrayOf(
+                        "seek",
+                        target.toString(),
+                        "absolute"
+                    )
+                )
+                session.markApplied(LibmpvSession.MpvIntent.SEEK)
+            }
+        }
+
     }
 
     private fun stopPlayback() {
@@ -383,10 +399,7 @@ class LibmpvRenderer(
 
     override fun event(eventId: Int) {
         when (eventId) {
-            MPVLib.MpvEvent.MPV_EVENT_FILE_LOADED -> {
-                session.hasFileLoaded = true
-            }
-
+            MPVLib.MpvEvent.MPV_EVENT_FILE_LOADED,
             MPVLib.MpvEvent.MPV_EVENT_PLAYBACK_RESTART -> {
                 session.hasFileLoaded = true
                 applyDeferredState()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libmpv",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "description": "A libmpv Fabric component for Android",
   "main": "build/index.js",
   "types": "build/index.d.ts",