expo-libmpv 0.3.0 → 0.3.2

package/android/build.gradle

@@ -36,7 +36,7 @@ if (useManagedAndroidSdkVersions) {
 }
 
 dependencies {
-  implementation "com.libmpv:android-libmpv:0.5.10"
+  implementation "com.libmpv:android-libmpv:0.6.2"
 }
 
 android {

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

@@ -0,0 +1,15 @@
+package com.libmpv
+
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class LibmpvModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name("Libmpv")
+
+    AsyncFunction("getProperty") { viewTag: Int, name: String ->
+      val view = appContext.findView<LibmpvView>(viewTag)
+      view?.getProperty(name)
+    }
+  }
+}

package/android/src/main/java/com/libmpv/{LibmpvVideoView.kt → LibmpvView.kt}

@@ -12,9 +12,10 @@ import dev.jdtech.mpv.MPVLib
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.views.ExpoView
 import expo.modules.kotlin.viewevent.EventDispatcher
+import kotlinx.coroutines.runBlocking
 
-class LibmpvVideoView(context: Context, appContext: AppContext) :
-  ExpoView(context,appContext),
+class LibmpvView(context: Context, appContext: AppContext) :
+  ExpoView(context, appContext),
   SurfaceHolder.Callback,
   MPVLib.LogObserver,
   MPVLib.EventObserver {
@@ -27,7 +28,10 @@ class LibmpvVideoView(context: Context, appContext: AppContext) :
   private val onLibmpvLog by EventDispatcher()
   private val onLibmpvEvent by EventDispatcher()
 
-  private var isSurfaceCreated: Boolean = false
+  @Volatile private var isSurfaceCreated = false
+  @Volatile private var cleaning = false
+  private val mainHandler = Handler(Looper.getMainLooper())
+
   val mpv: LibmpvWrapper = LibmpvWrapper(context)
   private val surfaceView: SurfaceView = SurfaceView(context)
 
@@ -38,77 +42,82 @@ class LibmpvVideoView(context: Context, appContext: AppContext) :
   var audioIndex: Int? = null
   var subtitleIndex: Int? = null
   var useHardwareDecoder: Boolean? = null
+  var seekToSeconds: Int? = null
 
   init {
     surfaceView.holder.addCallback(this)
     val layoutParams = FrameLayout.LayoutParams(
-        FrameLayout.LayoutParams.MATCH_PARENT,
-        FrameLayout.LayoutParams.MATCH_PARENT
+      FrameLayout.LayoutParams.MATCH_PARENT,
+      FrameLayout.LayoutParams.MATCH_PARENT
     )
-  appContext.activityProvider?.currentActivity?.let { activity ->
-    if (activity is androidx.lifecycle.LifecycleOwner) {
-      activity.lifecycle.addObserver(object : DefaultLifecycleObserver {
-        override fun onDestroy(owner: LifecycleOwner) {
-          log("LibmpvVideoView", "Lifecycle onDestroy -> cleanup()")
-          cleanup()
-        }
-      })
+
+    appContext.activityProvider?.currentActivity?.let { activity ->
+      if (activity is androidx.lifecycle.LifecycleOwner) {
+        activity.lifecycle.addObserver(object : DefaultLifecycleObserver {
+          override fun onDestroy(owner: LifecycleOwner) {
+            log("LibmpvView", "Lifecycle onDestroy -> cleanup()")
+            cleanup()
+          }
+        })
+      }
     }
-  }
 
     addView(surfaceView, layoutParams)
   }
 
   fun isSurfaceReady(): Boolean = isSurfaceCreated
 
-  fun attemptCreation(){
-        val allPropsReady = playUrl != null &&
-                            surfaceWidth != null &&
-                            surfaceHeight != null &&
-                            audioIndex != null &&
-                            subtitleIndex != null &&
-                            useHardwareDecoder != null
-
-        if (allPropsReady) {
-            log("LibmpvVideoView.attemptCreation", "Initializing MPV instance")
-            createNativePlayer()
-        } else {
-          log("LibmpvVideoView.attemptCreation", "attemptCreation wasn't ready")
-        }
+  fun attemptCreation() {
+    val allPropsReady = playUrl != null &&
+                        surfaceWidth != null &&
+                        surfaceHeight != null &&
+                        audioIndex != null &&
+                        subtitleIndex != null &&
+                        useHardwareDecoder != null
+
+    if (allPropsReady) {
+      log("LibmpvView.attemptCreation", "Initializing MPV instance")
+      createNativePlayer()
+    } else {
+      log("LibmpvView.attemptCreation", "attemptCreation wasn't ready")
+    }
   }
 
   fun createNativePlayer() {
     mpv.create()
     prepareMpvSettings()
-    log("LibmpvVideoView.createNativePlayer", "mpv settings prepared. Waiting on surface creation.")
+    log("LibmpvView.createNativePlayer", "mpv settings prepared. Waiting on surface creation.")
   }
 
-  fun runCommand(orders: String){
+  fun runCommand(orders: String) {
     mpv.command(orders.split("|").toTypedArray())
   }
 
-  fun setOptionString(options: String){
+  fun setOptionString(options: String) {
     val parts = options.split("|").toTypedArray()
-    mpv.setOptionString(parts[0],parts[1])
+    if (parts.size == 2) mpv.setOptionString(parts[0], parts[1])
+  }
+
+  fun getProperty(name: String): String? {
+    return runBlocking { mpv.getProperty(name) }
   }
 
   private fun prepareMpvSettings() {
     mpv.addLogObserver(this)
     mpv.addEventObserver(this)
-    mpv.setOptionString("force-window", "no")
 
+    mpv.setOptionString("force-window", "no")
     mpv.setOptionString("config", "yes")
-    val mpvDir = mpv.getMpvDirectoryPath()
-    mpvDir?.let{
-      mpv.setOptionString("config-dir", mpvDir)
-      mpv.setOptionString("sub-font-dir", mpvDir)
+
+    mpv.getMpvDirectoryPath()?.let { dir ->
+      mpv.setOptionString("config-dir", dir)
+      mpv.setOptionString("sub-font-dir", dir)
     }
 
     mpv.setOptionString("keep-open", "always")
     mpv.setOptionString("save-position-on-quit", "no")
     mpv.setOptionString("ytdl", "no")
     mpv.setOptionString("msg-level", "all=no")
-
     mpv.setOptionString("profile", "fast")
     mpv.setOptionString("vo", "gpu-next")
 
@@ -122,15 +131,15 @@ class LibmpvVideoView(context: Context, appContext: AppContext) :
     mpv.setOptionString("gpu-context", "android")
     mpv.setOptionString("opengl-es", "yes")
     mpv.setOptionString("video-sync", "audio")
-
+    mpv.setOptionString("audio-samplerate", "48000")
+    mpv.setOptionString("audio-format", "float")
+    mpv.setOptionString("audio-buffer", "2.0")
     mpv.setOptionString("ao", "audiotrack")
     mpv.setOptionString("alang", "")
-
     mpv.setOptionString("sub-font-provider", "none")
     mpv.setOptionString("slang", "")
     mpv.setOptionString("sub-scale-with-window", "yes")
     mpv.setOptionString("sub-use-margins", "no")
-
     mpv.setOptionString("cache", "yes")
     mpv.setOptionString("cache-pause-initial", "yes")
     mpv.setOptionString("cache-secs", "5")
@@ -138,45 +147,34 @@ class LibmpvVideoView(context: Context, appContext: AppContext) :
   }
 
   fun log(method: String, argument: String) {
-    onLibmpvLog(mapOf(
-      "method" to method,
-      "argument" to argument
-    ))
+    onLibmpvLog(mapOf("method" to method, "argument" to argument))
   }
 
   override fun surfaceCreated(holder: SurfaceHolder) {
-    val width = surfaceWidth ?: 0
-    val height = surfaceHeight ?: 0
-    // In the new Fabric version, this is stretching the content
-    //holder.setFixedSize(width, height)
-    //mpv.setPropertyString("android-surface-size", "${width}x${height}")
     mpv.attachSurface(surfaceView)
     prepareMpvPlayback()
     isSurfaceCreated = true
-    log("LibmpvVideoView.surfaceCreated", "Surface created and MPV should be playing")
+    log("LibmpvView.surfaceCreated", "Surface created and MPV attached")
   }
 
   private fun prepareMpvPlayback() {
     mpv.init()
     mpv.setOptionString("force-window", "yes")
-    var options = "vid=1"
-    options += if (audioIndex == -1) {
-      ",aid=no"
-    } else {
-      ",aid=${(audioIndex ?: 0) + 1}"
-    }
-    options += if (subtitleIndex == -1) {
-      ",sid=no"
-    } else {
-      ",sid=${(subtitleIndex ?: 0) + 1}"
+
+    val aid = if (audioIndex == -1) "aid=no" else "aid=${(audioIndex ?: 0) + 1}"
+    val sid = if (subtitleIndex == -1) "sid=no" else "sid=${(subtitleIndex ?: 0) + 1}"
+    val opts = "vid=1,$aid,$sid"
+    val url = playUrl ?: ""
+    mpv.play(url, opts)
+    if (seekToSeconds != null && seekToSeconds!! > 0) {
+      mpv.seekToSeconds(seekToSeconds!!)
+      log("LibmpvView.prepareMpvPlayback", "Applied initial seek to $seekToSeconds")
     }
-    val url: String = (playUrl as? String) ?: ""
-    mpv.play(url, options)
   }
 
   fun setHardwareDecoder(useHardware: Boolean) {
     useHardwareDecoder = useHardware
-    if (useHardwareDecoder == true) {
+    if (useHardware) {
       mpv.setOptionString("hwdec", HARDWARE_OPTIONS)
       mpv.setOptionString("hwdec-codecs", ACCELERATED_CODECS)
     } else {
@@ -186,90 +184,66 @@ class LibmpvVideoView(context: Context, appContext: AppContext) :
 
   override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {}
 
-fun cleanup() {
-  // Launch on background executor so UI returns immediately
-  Thread {
-    try {
-      try { mpv.setPropertyString("pause", "yes") } catch (_: Throwable) {}
-      try { mpv.setPropertyString("ao", "null") } catch (_: Throwable) {}
-      Handler(Looper.getMainLooper()).post {
-        try {
-          surfaceView.holder.removeCallback(this@LibmpvVideoView)
-          mpv.cleanup()
-        } catch (e: Exception) {
+  fun cleanup() {
+    if (cleaning) return
+    cleaning = true
+    Thread {
+      try {
+        runCatching { mpv.setPropertyString("pause", "yes") }
+        runCatching { mpv.setPropertyString("ao", "null") }
+
+        mainHandler.post {
+          try {
+            surfaceView.holder.removeCallback(this@LibmpvView)
+            mpv.cleanup()
+          } catch (_: Exception) {}
+          cleaning = false
         }
-      }
-    } catch (_: Throwable) {}
-  }.start()
-}
+      } catch (_: Throwable) {}
+    }.start()
+  }
 
   override fun surfaceDestroyed(holder: SurfaceHolder) {
-    try {
-      mpv.setPropertyString("pause", "yes")
-      mpv.setPropertyString("vo", "null")
-      mpv.setPropertyString("force-window", "no")
-    } catch (_: Throwable) {}
-    try { mpv.detachSurface() } catch (_: Throwable) {}
+    runCatching { mpv.setPropertyString("pause", "yes") }
+    runCatching { mpv.setPropertyString("vo", "null") }
+    runCatching { mpv.setPropertyString("force-window", "no") }
+    runCatching { mpv.detachSurface() }
+    isSurfaceCreated = false
   }
 
-  // MPVLib.LogObserver
   override fun logMessage(prefix: String, level: Int, text: String) {
-    onLibmpvLog(mapOf(
-      "prefix" to prefix,
-      "level" to "$level",
-      "text" to text
-    ))
+    onLibmpvLog(mapOf("prefix" to prefix, "level" to "$level", "text" to text))
   }
 
-  // MPVLib.EventObserver
   override fun eventProperty(property: String) {
-    onLibmpvEvent(mapOf(
-      "property" to property,
-      "kind" to "none"
-    ))
+    onLibmpvEvent(mapOf("property" to property, "kind" to "none"))
   }
 
   override fun eventProperty(property: String, value: Long) {
-    onLibmpvEvent(mapOf(
-      "property" to property,
-      "kind" to "long",
-      "value" to "$value"
-    ))
+    onLibmpvEvent(mapOf("property" to property, "kind" to "long", "value" to "$value"))
   }
 
   override fun eventProperty(property: String, value: Double) {
-    onLibmpvEvent(mapOf(
-      "property" to property,
-      "kind" to "double",
-      "value" to "$value"
-    ))
+    onLibmpvEvent(mapOf("property" to property, "kind" to "double", "value" to "$value"))
   }
 
   override fun eventProperty(property: String, value: Boolean) {
-    onLibmpvEvent(mapOf(
-      "property" to property,
-      "kind" to "boolean",
-      "value" to if (value) "true" else "false"
-    ))
+    onLibmpvEvent(mapOf("property" to property, "kind" to "boolean", "value" to if (value) "true" else "false"))
   }
 
   override fun eventProperty(property: String, value: String) {
-    onLibmpvEvent(mapOf(
-      "property" to property,
-      "kind" to "string",
-      "value" to value
-    ))
+    onLibmpvEvent(mapOf("property" to property, "kind" to "string", "value" to value))
   }
 
   override fun event(eventId: Int) {
-    onLibmpvEvent(mapOf(
-      "eventId" to "$eventId",
-      "kind" to "eventId"
-    ))
+    onLibmpvEvent(mapOf("eventId" to "$eventId", "kind" to "eventId"))
   }
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    cleanup()
+    if (!cleaning) {
+      cleaning = true
+      cleanup()
+    }
   }
 }

package/android/src/main/java/com/libmpv/{LibmpvVideoModule.kt → LibmpvViewModule.kt}

@@ -3,25 +3,26 @@ package com.libmpv
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 
-class LibmpvVideoModule : Module() {
+class LibmpvViewModule : Module() {
   override fun definition() = ModuleDefinition {
-    Name("LibmpvVideo")
-    View(LibmpvVideoView::class) {
+    Name("LibmpvView")
+
+    View(LibmpvView::class) {
         Events("onLibmpvLog", "onLibmpvEvent")
 
-        AsyncFunction("runCommand") { view: LibmpvVideoView, orders: String ->
+        AsyncFunction("runCommand") { view: LibmpvView, orders: String ->
             view.runCommand(orders)
         }
 
-        AsyncFunction("setOptionString") { view: LibmpvVideoView, options: String ->
+        AsyncFunction("setOptionString") { view: LibmpvView, options: String ->
             view.setOptionString(options)
         }
 
-        AsyncFunction("cleanup") { view: LibmpvVideoView ->
+        AsyncFunction("cleanup") { view: LibmpvView ->
             view.cleanup()
         }
 
-        Prop("playUrl") { view: LibmpvVideoView, playUrl: String ->
+        Prop("playUrl") { view: LibmpvView, playUrl: String ->
             view.playUrl = playUrl
             if (view.isSurfaceReady()) {
                 view.mpv.play(playUrl)
@@ -31,7 +32,7 @@ class LibmpvVideoModule : Module() {
             view.log("setPlayUrl", playUrl)
         }
 
-        Prop("useHardwareDecoder") { view: LibmpvVideoView, useHardwareDecoder: Boolean ->
+        Prop("useHardwareDecoder") { view: LibmpvView, useHardwareDecoder: Boolean ->
             view.useHardwareDecoder = useHardwareDecoder
             if (view.isSurfaceReady()) {
                 view.setHardwareDecoder(useHardwareDecoder)
@@ -41,7 +42,7 @@ class LibmpvVideoModule : Module() {
             view.log("setUseHardwareDecoder", "$useHardwareDecoder")
         }
 
-        Prop("surfaceWidth") { view: LibmpvVideoView, surfaceWidth: Int ->
+        Prop("surfaceWidth") { view: LibmpvView, surfaceWidth: Int ->
             view.surfaceWidth = surfaceWidth
             if (view.isSurfaceReady()) {
                 view.mpv.setSurfaceWidth(surfaceWidth)
@@ -51,7 +52,7 @@ class LibmpvVideoModule : Module() {
             view.log("setSurfaceWidth", "$surfaceWidth")
         }
 
-        Prop("surfaceHeight") { view: LibmpvVideoView, surfaceHeight: Int ->
+        Prop("surfaceHeight") { view: LibmpvView, surfaceHeight: Int ->
             view.surfaceHeight = surfaceHeight
             if (view.isSurfaceReady()) {
                 view.mpv.setSurfaceHeight(surfaceHeight)
@@ -61,7 +62,7 @@ class LibmpvVideoModule : Module() {
             view.log("setSurfaceHeight", "$surfaceHeight")
         }
 
-        Prop("selectedAudioTrack") { view: LibmpvVideoView, audioTrackIndex: Int ->
+        Prop("selectedAudioTrack") { view: LibmpvView, audioTrackIndex: Int ->
             view.audioIndex = audioTrackIndex
             if (view.isSurfaceReady()) {
                 val mpvIndex = if (audioTrackIndex != -1) (audioTrackIndex + 1).toString() else "no"
@@ -72,7 +73,7 @@ class LibmpvVideoModule : Module() {
             view.log("selectAudioTrack", "$audioTrackIndex")
         }
 
-        Prop("selectedSubtitleTrack") { view: LibmpvVideoView, subtitleTrackIndex: Int ->
+        Prop("selectedSubtitleTrack") { view: LibmpvView, subtitleTrackIndex: Int ->
             view.subtitleIndex = subtitleTrackIndex
             if (view.isSurfaceReady()) {
                 val mpvIndex = if (subtitleTrackIndex != -1) (subtitleTrackIndex + 1).toString() else "no"
@@ -83,14 +84,16 @@ class LibmpvVideoModule : Module() {
             view.log("selectSubtitleTrack", "$subtitleTrackIndex")
         }
 
-        Prop("seekToSeconds") { view: LibmpvVideoView, seconds: Int ->
+        Prop("seekToSeconds") { view: LibmpvView, seconds: Int ->
             if (view.isSurfaceReady()) {
                 view.mpv.seekToSeconds(seconds)
+            } else {
+                view.seekToSeconds = seconds
             }
             view.log("seekToSeconds", "$seconds")
         }
 
-        Prop("isPlaying") { view: LibmpvVideoView, isPlaying: Boolean ->
+        Prop("isPlaying") { view: LibmpvView, isPlaying: Boolean ->
             if (view.isSurfaceReady() && view.mpv.hasPlayedOnce()) {
                 when {
                     isPlaying && !view.mpv.isPlaying() -> {
@@ -105,7 +108,7 @@ class LibmpvVideoModule : Module() {
             }
         }
 
-        OnViewDestroys { view: LibmpvVideoView ->
+        OnViewDestroys { view: LibmpvView ->
             view.cleanup()
         }
     }

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

@@ -1,274 +1,229 @@
 package com.libmpv
 
+import android.content.Context
 import android.os.Handler
 import android.os.Looper
-import android.content.Context
 import android.util.Log
 import android.view.SurfaceView
 import dev.jdtech.mpv.MPVLib
 import java.io.File
 import java.io.FileOutputStream
-import java.io.InputStream
-import java.io.OutputStream
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
 
 class LibmpvWrapper(private val applicationContext: Context) {
     companion object {
         private const val TAG = "react-native-libmpv"
-        private var swallow = true
     }
 
+    private enum class State { NEW, CREATED, INIT, RUNNING, CLEANUP, DESTROYED }
+
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private val mpv = MPVLib()
+
     @Volatile private var created = false
-    @Volatile private var destroying = false
-    @Volatile private var isDestroyed = false
     @Volatile private var cleaning = false
+    @Volatile private var isDestroyed = false
+    @Volatile private var state = State.NEW
+
     private var isPlaying = false
     private var hasPlayedOnce = false
+    private var mpvDirectory: String? = null
     private var eventObserver: MPVLib.EventObserver? = null
     private var logObserver: MPVLib.LogObserver? = null
-    private var mpvDirectory: String? = null
+    private var surfaceView: SurfaceView? = null
     private var surfaceWidth: Int = -1
     private var surfaceHeight: Int = -1
-    private var surfaceView: SurfaceView? = null
-    private val mpv: MPVLib = MPVLib()
 
-    fun create(): Boolean {
-        mpv.create(applicationContext)
-        createMpvDirectory()
-        created = true
-        return true
+    private inline fun safe(block: () -> Unit) {
+        try { block() } catch (e: Exception) { logException(e) }
     }
 
-    fun isCreated(): Boolean = created
-    fun isPlaying(): Boolean = isPlaying
-    fun hasPlayedOnce(): Boolean = hasPlayedOnce
-    fun getMpvDirectoryPath(): String? = mpvDirectory
-
-    private fun createMpvDirectory() {
-        if (isDestroyed) return
-        val mpvDir = File(applicationContext.getExternalFilesDir("mpv"), "mpv")
+    private fun logException(e: Exception) {
         try {
-            mpvDirectory = mpvDir.absolutePath
-            if (!mpvDir.exists() && !mpvDir.mkdirs()) {
-                Log.e(TAG, "exception", IllegalArgumentException("Unable to create $mpvDir"))
-                return
-            }
+            Log.e(TAG, "mpv exception", e)
+            logObserver?.logMessage("RNLE", 20, e.message ?: "unknown native error")
+        } catch (_: Throwable) {}
+    }
 
-            // Copy font
-            val mpvFontPath = "${mpvDir}/subfont.ttf"
-            applicationContext.assets.open("subfont.ttf").use { subfontIn ->
-                FileOutputStream(mpvFontPath).use { fontOut ->
-                    subfontIn.copyTo(fontOut)
-                }
+    private fun ensureUi(block: () -> Unit) {
+        if (Looper.myLooper() == Looper.getMainLooper()) block()
+        else mainHandler.post(block)
+    }
+
+    fun create(): Boolean {
+        ensureUi {
+            safe {
+                mpv.create(applicationContext)
+                createMpvDirectory()
+                created = true
+                state = State.CREATED
             }
+        }
+        return true
+    }
 
-            // Copy conf
-            val mpvConfPath = "${mpvDir}/mpv.conf"
-            applicationContext.assets.open("mpv.conf").use { mpvConfIn ->
-                FileOutputStream(mpvConfPath).use { confOut ->
-                    mpvConfIn.copyTo(confOut)
+    fun init() {
+        ensureUi {
+            safe {
+                if (state == State.CREATED) {
+                    mpv.init()
+                    state = State.RUNNING
                 }
             }
-        } catch (e: Exception) {
-            Log.e(TAG, "Unable to create the directory $mpvDir", e)
         }
     }
 
-    private fun logException(exception: Exception) {
-        if (isDestroyed) return
-        try {
-            val message: String = (exception.message as? String) ?: "Unable to read error message"
-            logObserver?.logMessage("RNLE", 20, message)
-        } catch (e: Exception) {
-            if (!swallow) throw e
+    fun destroy() = cleanup()
+
+    fun cleanup() {
+        if (!created || cleaning || state >= State.CLEANUP) return
+        cleaning = true
+        state = State.CLEANUP
+        ensureUi {
+            safe { mpv.command(arrayOf("stop")) }
+            safe { mpv.setPropertyString("pause", "yes") }
+            safe { mpv.detachSurface() }
+            safe { mpv.removeObservers() }
+            safe { mpv.removeLogObservers() }
+            safe { mpv.destroy() }
+            created = false
+            isDestroyed = true
+            cleaning = false
+            state = State.DESTROYED
         }
     }
 
+    fun isCreated() = created
+    fun isAlive() = !isDestroyed
+    fun isPlaying() = isPlaying
+    fun hasPlayedOnce() = hasPlayedOnce
+    fun getMpvDirectoryPath() = mpvDirectory
+
     fun addEventObserver(observer: MPVLib.EventObserver) {
-        if (isDestroyed) return
-        try {
-            if (!created) return
-            mpv.removeObservers()
-            eventObserver = observer
-            mpv.addObserver(eventObserver)
-            mpv.observeProperty("demuxer-cache-time", MPVLib.MPV_FORMAT_INT64)
-            mpv.observeProperty("duration", MPVLib.MPV_FORMAT_INT64)
-            mpv.observeProperty("eof-reached", MPVLib.MPV_FORMAT_FLAG)
-            mpv.observeProperty("paused-for-cache", MPVLib.MPV_FORMAT_FLAG)
-            mpv.observeProperty("seekable", MPVLib.MPV_FORMAT_FLAG)
-            mpv.observeProperty("speed", MPVLib.MPV_FORMAT_DOUBLE)
-            mpv.observeProperty("time-pos", MPVLib.MPV_FORMAT_INT64)
-            mpv.observeProperty("track-list", MPVLib.MPV_FORMAT_STRING)
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
+        ensureUi {
+            safe {
+                mpv.removeObservers()
+                eventObserver = observer
+                mpv.addObserver(observer)
+            }
         }
     }
 
     fun addLogObserver(observer: MPVLib.LogObserver) {
-        if (isDestroyed) return
-        try {
-            if (!created) return
-            mpv.removeLogObservers()
-            logObserver = observer
-            mpv.addLogObserver(logObserver)
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
+        ensureUi {
+            safe {
+                mpv.removeLogObservers()
+                logObserver = observer
+                mpv.addLogObserver(observer)
+            }
         }
     }
 
-    fun setOptionString(option: String, setting: String) {
-        if (isDestroyed) return
-        try {
-            if (created) mpv.setOptionString(option, setting)
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
-        }
+    fun setOptionString(option: String, value: String) {
+        ensureUi { safe { mpv.setOptionString(option, value) } }
     }
 
-    fun setPropertyString(property: String, setting: String) {
-        if (isDestroyed) return
-        try {
-            if (created) mpv.setPropertyString(property, setting)
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
-        }
+    fun setPropertyString(property: String, value: String) {
+        ensureUi { safe { mpv.setPropertyString(property, value) } }
     }
 
-    fun init() {
-        if (isDestroyed) return
-        try {
-            if (created) mpv.init()
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
+    suspend fun getProperty(name: String): String? =
+        suspendCancellableCoroutine { cont ->
+            ensureUi {
+                try { cont.resume(mpv.getPropertyString(name)) }
+                catch (e: Exception) { logException(e); cont.resume(null) }
+            }
         }
-    }
 
     fun command(orders: Array<String>) {
-        if (isDestroyed) return
-        try {
-            if (created) mpv.command(orders)
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
-        }
+        ensureUi { safe { mpv.command(orders) } }
     }
 
     fun attachSurface(surfaceView: SurfaceView) {
-        if (isDestroyed) return
-        try {
-            if (created) {
-                this.surfaceView = surfaceView
-                applySurfaceDimensions()
-                mpv.attachSurface(surfaceView.holder.surface)
+        this.surfaceView = surfaceView
+        applySurfaceDimensions()
+        ensureUi {
+            safe {
+                if (state >= State.CREATED && state < State.CLEANUP) {
+                    mpv.attachSurface(surfaceView.holder.surface)
+                }
             }
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
         }
     }
 
-    fun play(url: String, options: String? = null) {
-        if (isDestroyed) return
-        if (!isPlaying) {
-            if (options == null) {
-                command(arrayOf("loadfile", url))
-            } else {
-                command(arrayOf("loadfile", url, "replace", "0", options))
-            }
-            command(arrayOf("set", "pause", "no"))
-            hasPlayedOnce = true
-            isPlaying = true
-        }
+    fun detachSurface() {
+        ensureUi { safe { mpv.detachSurface() } }
     }
 
-    fun pauseOrUnpause() {
-        if (isDestroyed) return
-        if (!hasPlayedOnce) return
-        if (isPlaying) pause() else unpause()
+    fun setSurfaceWidth(width: Int) {
+        surfaceWidth = width
+        applySurfaceDimensions()
     }
 
-    fun pause() {
-        if (isDestroyed) return
-        if (!hasPlayedOnce) return
-        if (isPlaying) {
-            command(arrayOf("set", "pause", "yes"))
-            isPlaying = false
-        }
+    fun setSurfaceHeight(height: Int) {
+        surfaceHeight = height
+        applySurfaceDimensions()
     }
 
-    fun unpause() {
-        if (isDestroyed) return
-        if (!hasPlayedOnce) return
-        if (!isPlaying) {
-            command(arrayOf("set", "pause", "no"))
-            isPlaying = true
+    private fun applySurfaceDimensions() {
+        ensureUi {
+            try {
+                if (surfaceWidth > 0 && surfaceHeight > 0 && surfaceView != null) {
+                    surfaceView?.holder?.setFixedSize(surfaceWidth, surfaceHeight)
+                }
+            } catch (e: Exception) { logException(e) }
         }
     }
 
-    fun seekToSeconds(seconds: Int) {
-        if (isDestroyed) return
-        if (created) {
-            command(arrayOf("seek", seconds.toString(), "absolute"))
+    fun play(url: String, options: String? = null) {
+        ensureUi {
+            safe {
+                if (!isPlaying) {
+                    if (options == null)
+                        mpv.command(arrayOf("loadfile", url))
+                    else
+                        mpv.command(arrayOf("loadfile", url, "replace", "0", options))
+                    mpv.command(arrayOf("set", "pause", "no"))
+                    hasPlayedOnce = true
+                    isPlaying = true
+                }
+            }
         }
     }
 
-    private fun applySurfaceDimensions() {
-        if (isDestroyed) return
-        if (surfaceHeight != -1 && surfaceWidth != -1 && surfaceView != null) {
-            surfaceView?.holder?.setFixedSize(surfaceWidth, surfaceHeight)
-        }
+    fun pause() {
+        ensureUi { safe { mpv.command(arrayOf("set", "pause", "yes")); isPlaying = false } }
     }
 
-    fun setSurfaceWidth(width: Int) {
-        surfaceWidth = width
-        applySurfaceDimensions()
+    fun unpause() {
+        ensureUi { safe { mpv.command(arrayOf("set", "pause", "no")); isPlaying = true } }
     }
 
-    fun setSurfaceHeight(height: Int) {
-        surfaceHeight = height
-        applySurfaceDimensions()
+    fun pauseOrUnpause() {
+        ensureUi { if (isPlaying) pause() else unpause() }
     }
 
-  fun detachSurface(){
-    if(isDestroyed) return
-    try{
-
-    }catch(swallow:Exception){}
-  }
-
-
-fun cleanup() {
-  if (!created || cleaning) return
-  cleaning = true
-
-  Thread {
-    try {
-      safe { command(arrayOf("stop")) }
-      safe { setPropertyString("pause", "yes") }
-      safe { setPropertyString("vo", "null") }
-      safe { setPropertyString("ao", "null") }
-      safe { detachSurface() }
-      Handler(Looper.getMainLooper()).post {
-        safe { mpv.removeObservers() }
-        safe { mpv.removeLogObservers() }
-        safe { mpv.destroy() }
-        created = false
-        cleaning = false
-      }
-    } catch (e: Exception) {
-      logException(e)
-      cleaning = false
+    fun seekToSeconds(seconds: Int) {
+        ensureUi { safe { mpv.command(arrayOf("seek", seconds.toString(), "absolute")) } }
     }
-  }.start()
-}
 
-  private inline fun safe(block: () -> Unit) {
-    try { if (created) block() } catch (e: Exception) { logException(e) }
-  }
-
-  fun destroy() = cleanup()
+    private fun createMpvDirectory() {
+        val dir = File(applicationContext.getExternalFilesDir("mpv"), "mpv")
+        try {
+            mpvDirectory = dir.absolutePath
+            if (!dir.exists() && !dir.mkdirs()) {
+                Log.e(TAG, "Unable to create $dir")
+                return
+            }
+            applicationContext.assets.open("subfont.ttf").use { inp ->
+                FileOutputStream("${dir}/subfont.ttf").use { out -> inp.copyTo(out) }
+            }
+            applicationContext.assets.open("mpv.conf").use { inp ->
+                FileOutputStream("${dir}/mpv.conf").use { out -> inp.copyTo(out) }
+            }
+        } catch (e: Exception) {
+            logException(e)
+        }
+    }
 }

package/build/Libmpv.d.ts

@@ -0,0 +1,5 @@
+export declare const Libmpv: {
+    getProperty(viewTag: number, name: string): Promise<string | null>;
+};
+export default Libmpv;
+//# sourceMappingURL=Libmpv.d.ts.map

package/build/Libmpv.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Libmpv.d.ts","sourceRoot":"","sources":["../src/Libmpv.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,MAAM;yBACM,MAAM,QAAQ,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAC1D,CAAC;AAEb,eAAe,MAAM,CAAA"}

package/build/Libmpv.js

@@ -0,0 +1,4 @@
+import { requireNativeModule } from 'expo-modules-core';
+export const Libmpv = requireNativeModule('Libmpv');
+export default Libmpv;
+//# sourceMappingURL=Libmpv.js.map

package/build/Libmpv.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Libmpv.js","sourceRoot":"","sources":["../src/Libmpv.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,CAAC,MAAM,MAAM,GAAG,mBAAmB,CAEtC,QAAQ,CAAC,CAAC;AAEb,eAAe,MAAM,CAAA","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\n\nexport const Libmpv = requireNativeModule<'getProperty' extends never ? any : {\n    getProperty(viewTag: number, name: string): Promise<string | null>;\n}>('Libmpv');\n\nexport default Libmpv"]}

package/build/LibmpvView.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+import { LibmpvViewProps, LibmpvViewNativeMethods } from './LibmpvViewTypes';
+export declare const LibmpvView: React.ForwardRefExoticComponent<Omit<LibmpvViewProps, "ref"> & React.RefAttributes<LibmpvViewNativeMethods>>;
+export default LibmpvView;
+//# sourceMappingURL=LibmpvView.d.ts.map

package/build/LibmpvView.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LibmpvView.d.ts","sourceRoot":"","sources":["../src/LibmpvView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAkC7E,eAAO,MAAM,UAAU,8GAsDrB,CAAA;AAEF,eAAe,UAAU,CAAA"}

package/build/{LibmpvVideoView.js → LibmpvView.js}

@@ -28,8 +28,8 @@ const EVENT_LOOKUP = {
     24: 'QUEUE_OVERFLOW',
     25: 'HOOK'
 };
-const LibmpvVideoView = requireNativeView('LibmpvVideo');
-export const LibmpvVideo = React.forwardRef((props, parentRef) => {
+const LibmpvViewNative = requireNativeView('LibmpvView');
+export const LibmpvView = React.forwardRef((props, parentRef) => {
     React.useEffect(() => {
         return () => {
             if (parentRef?.current?.cleanup) {
@@ -67,7 +67,7 @@ export const LibmpvVideo = React.forwardRef((props, parentRef) => {
     // The order props are handled in the native code is non-deterministic
     // Each native prop setter checks to see if all required props are set
     // Only then will it try to create an instance of mpv
-    return <LibmpvVideoView ref={parentRef} style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer} playUrl={props.playUrl} isPlaying={props.isPlaying} useHardwareDecoder={props.useHardwareDecoder} surfaceWidth={props.surfaceWidth} surfaceHeight={props.surfaceHeight} selectedAudioTrack={props.selectedAudioTrack} selectedSubtitleTrack={props.selectedSubtitleTrack} seekToSeconds={props.seekToSeconds} onLibmpvEvent={onLogEvent} onLibmpvLog={onLibmpvLog}/>;
+    return <LibmpvViewNative ref={parentRef} style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer} playUrl={props.playUrl} isPlaying={props.isPlaying} useHardwareDecoder={props.useHardwareDecoder} surfaceWidth={props.surfaceWidth} surfaceHeight={props.surfaceHeight} selectedAudioTrack={props.selectedAudioTrack} selectedSubtitleTrack={props.selectedSubtitleTrack} seekToSeconds={props.seekToSeconds} onLibmpvEvent={onLogEvent} onLibmpvLog={onLibmpvLog}/>;
 });
-export default LibmpvVideo;
-//# sourceMappingURL=LibmpvVideoView.js.map
+export default LibmpvView;
+//# sourceMappingURL=LibmpvView.js.map

package/build/LibmpvView.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LibmpvView.js","sourceRoot":"","sources":["../src/LibmpvView.tsx"],"names":[],"mappings":"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","sourcesContent":["import { requireNativeView } from 'expo';\nimport * as React from 'react';\nimport { LibmpvViewProps, LibmpvViewNativeMethods } from './LibmpvViewTypes';\n\nconst styles: any = {\n  videoPlayer: {\n    position: \"absolute\",\n    left: 0,\n    bottom: 0,\n    right: 0,\n    top: 0\n  }\n};\n\nconst EVENT_LOOKUP: any = {\n  0: 'NONE',\n  1: 'SHUTDOWN',\n  2: 'LOG_MESSAGE',\n  3: 'GET_PROPERTY_REPLY',\n  4: 'SET_PROPERTY_REPLY',\n  5: 'COMMAND_REPLY',\n  6: 'START_FILE',\n  7: 'END_FILE',\n  8: 'FILE_LOADED',\n  16: 'CLIENT_MESSAGE',\n  17: 'VIDEO_RECONFIG',\n  18: 'AUDIO_RECONFIG',\n  20: 'SEEK',\n  21: 'PLAYBACK_RESTART',\n  22: 'PROPERTY_CHANGE',\n  24: 'QUEUE_OVERFLOW',\n  25: 'HOOK'\n}\n\nconst LibmpvViewNative: React.ComponentType<LibmpvViewProps> = requireNativeView('LibmpvView');\n\nexport const LibmpvView = React.forwardRef<LibmpvViewNativeMethods, LibmpvViewProps>((props: any, parentRef: any) => {\n  React.useEffect(() => {\n    return () => {\n      if (parentRef?.current?.cleanup) {\n        parentRef.current.cleanup();\n      }\n    };\n  }, []);\n\n  // Pass mpv events and logs back up to the parent\n  const onLogEvent = (libmpvEvent: any) => {\n    if (props.onLibmpvEvent) {\n      if (libmpvEvent && libmpvEvent.nativeEvent) {\n        libmpvEvent = libmpvEvent.nativeEvent\n      }\n      if (libmpvEvent.eventId) {\n        libmpvEvent.value = parseInt(libmpvEvent.eventId, 10)\n        libmpvEvent.eventKind = EVENT_LOOKUP[libmpvEvent.eventId]\n      }\n      else if (libmpvEvent.kind === 'long' || libmpvEvent.kind === 'double') {\n        libmpvEvent.value = Number(libmpvEvent.value)\n      }\n      else if (libmpvEvent.kind === 'boolean') {\n        libmpvEvent.value = libmpvEvent.value === 'true'\n      }\n      return props.onLibmpvEvent(libmpvEvent)\n    }\n  }\n  const onLibmpvLog = (libmpvLog: any) => {\n    if (props.onLibmpvLog) {\n      if (libmpvLog && libmpvLog.nativeEvent) {\n        libmpvLog = libmpvLog.nativeEvent\n      }\n      return props.onLibmpvLog(libmpvLog);\n    }\n  }\n\n  // The order props are handled in the native code is non-deterministic\n  // Each native prop setter checks to see if all required props are set\n  // Only then will it try to create an instance of mpv\n  return <LibmpvViewNative\n    ref={parentRef}\n    style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer}\n    playUrl={props.playUrl}\n    isPlaying={props.isPlaying}\n    useHardwareDecoder={props.useHardwareDecoder}\n    surfaceWidth={props.surfaceWidth}\n    surfaceHeight={props.surfaceHeight}\n    selectedAudioTrack={props.selectedAudioTrack}\n    selectedSubtitleTrack={props.selectedSubtitleTrack}\n    seekToSeconds={props.seekToSeconds}\n    onLibmpvEvent={onLogEvent}\n    onLibmpvLog={onLibmpvLog}\n  />\n})\n\nexport default LibmpvView"]}

package/build/{LibmpvVideo.types.d.ts → LibmpvViewTypes.d.ts}

@@ -1,4 +1,4 @@
-export type LibmpvVideoViewProps = {
+export type LibmpvViewProps = {
     ref: any;
     style: any;
     playUrl: string;
@@ -12,8 +12,8 @@ export type LibmpvVideoViewProps = {
     onLibmpvEvent: (libmpvEvent: any) => void;
     onLibmpvLog: (libmpvLog: any) => void;
 };
-export type LibmpvNativeMethods = {
+export type LibmpvViewNativeMethods = {
     runCommand: (pipeDelimitedArguments: string) => void | Promise<void>;
     setOptionString: (pipeDelimitedArguments: string) => void | Promise<void>;
 };
-//# sourceMappingURL=LibmpvVideo.types.d.ts.map
+//# sourceMappingURL=LibmpvViewTypes.d.ts.map

package/build/LibmpvViewTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LibmpvViewTypes.d.ts","sourceRoot":"","sources":["../src/LibmpvViewTypes.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,CAAC,WAAW,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,WAAW,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,EAAE,CAAC,sBAAsB,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,eAAe,EAAE,CAAC,sBAAsB,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E,CAAC"}

package/build/LibmpvViewTypes.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=LibmpvViewTypes.js.map

package/build/LibmpvViewTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LibmpvViewTypes.js","sourceRoot":"","sources":["../src/LibmpvViewTypes.ts"],"names":[],"mappings":"","sourcesContent":["export type LibmpvViewProps = {\n  ref: any,\n  style: any,\n  playUrl: string,\n  isPlaying: boolean,\n  useHardwareDecoder: boolean,\n  selectedAudioTrack: number,\n  selectedSubtitleTrack: number,\n  seekToSeconds: number,\n  surfaceWidth: number,\n  surfaceHeight: number,\n  onLibmpvEvent: (libmpvEvent: any) => void,\n  onLibmpvLog: (libmpvLog: any) => void,\n};\n\nexport type LibmpvViewNativeMethods = {\n  runCommand: (pipeDelimitedArguments: string) => void | Promise<void>;\n  setOptionString: (pipeDelimitedArguments: string) => void | Promise<void>;\n};"]}

package/build/index.d.ts

@@ -1,3 +1,13 @@
-export { default as LibmpvVideo } from './LibmpvVideoView';
-export * from './LibmpvVideo.types';
+export { default as Libmpv } from './Libmpv';
+export { default as LibmpvView } from './LibmpvView';
+import * as LibmpvViewTypes from './LibmpvViewTypes';
+export * as LibmpvViewTypes from './LibmpvViewTypes';
+declare const _default: {
+    Module: {
+        getProperty(viewTag: number, name: string): Promise<string | null>;
+    };
+    View: import("react").ForwardRefExoticComponent<Omit<LibmpvViewTypes.LibmpvViewProps, "ref"> & import("react").RefAttributes<LibmpvViewTypes.LibmpvViewNativeMethods>>;
+    Types: typeof LibmpvViewTypes;
+};
+export default _default;
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC3D,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,UAAU,CAAA;AAG5C,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;;;;;;;;AAErD,wBAIC"}

package/build/index.js

@@ -1,3 +1,12 @@
-export { default as LibmpvVideo } from './LibmpvVideoView';
-export * from './LibmpvVideo.types';
+import { default as Libmpv } from './Libmpv';
+export { default as Libmpv } from './Libmpv';
+import { default as LibmpvView } from './LibmpvView';
+export { default as LibmpvView } from './LibmpvView';
+import * as LibmpvViewTypes from './LibmpvViewTypes';
+export * as LibmpvViewTypes from './LibmpvViewTypes';
+export default {
+    Module: Libmpv,
+    View: LibmpvView,
+    Types: LibmpvViewTypes
+};
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC3D,cAAc,qBAAqB,CAAC","sourcesContent":["export { default as LibmpvVideo } from './LibmpvVideoView';\nexport * from './LibmpvVideo.types';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,UAAU,CAAA;AAC5C,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,UAAU,CAAA;AAE5C,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAErD,eAAe;IACX,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,eAAe;CACzB,CAAA","sourcesContent":["import { default as Libmpv } from './Libmpv'\nexport { default as Libmpv } from './Libmpv'\n\nimport { default as LibmpvView } from './LibmpvView';\nexport { default as LibmpvView } from './LibmpvView';\n\nimport * as LibmpvViewTypes from './LibmpvViewTypes';\nexport * as LibmpvViewTypes from './LibmpvViewTypes';\n\nexport default {\n    Module: Libmpv,\n    View: LibmpvView,\n    Types: LibmpvViewTypes\n}\n"]}

package/expo-module.config.json

@@ -4,7 +4,8 @@
   ],
   "android": {
     "modules": [
-      "com.libmpv.LibmpvVideoModule"
+      "com.libmpv.LibmpvModule",
+      "com.libmpv.LibmpvViewModule"
     ]
   }
 }

package/package.json

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

package/src/Libmpv.tsx

@@ -0,0 +1,7 @@
+import { requireNativeModule } from 'expo-modules-core';
+
+export const Libmpv = requireNativeModule<'getProperty' extends never ? any : {
+    getProperty(viewTag: number, name: string): Promise<string | null>;
+}>('Libmpv');
+
+export default Libmpv

package/src/{LibmpvVideoView.tsx → LibmpvView.tsx}

@@ -1,7 +1,6 @@
 import { requireNativeView } from 'expo';
 import * as React from 'react';
-
-import { LibmpvVideoViewProps, LibmpvNativeMethods } from './LibmpvVideo.types';
+import { LibmpvViewProps, LibmpvViewNativeMethods } from './LibmpvViewTypes';
 
 const styles: any = {
   videoPlayer: {
@@ -33,10 +32,9 @@ const EVENT_LOOKUP: any = {
   25: 'HOOK'
 }
 
-const LibmpvVideoView: React.ComponentType<LibmpvVideoViewProps> =
-  requireNativeView('LibmpvVideo');
+const LibmpvViewNative: React.ComponentType<LibmpvViewProps> = requireNativeView('LibmpvView');
 
-export const LibmpvVideo = React.forwardRef<LibmpvNativeMethods, LibmpvVideoViewProps>((props: any, parentRef: any) => {
+export const LibmpvView = React.forwardRef<LibmpvViewNativeMethods, LibmpvViewProps>((props: any, parentRef: any) => {
   React.useEffect(() => {
     return () => {
       if (parentRef?.current?.cleanup) {
@@ -76,7 +74,7 @@ export const LibmpvVideo = React.forwardRef<LibmpvNativeMethods, LibmpvVideoView
   // The order props are handled in the native code is non-deterministic
   // Each native prop setter checks to see if all required props are set
   // Only then will it try to create an instance of mpv
-  return <LibmpvVideoView
+  return <LibmpvViewNative
     ref={parentRef}
     style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer}
     playUrl={props.playUrl}
@@ -92,4 +90,4 @@ export const LibmpvVideo = React.forwardRef<LibmpvNativeMethods, LibmpvVideoView
   />
 })
 
-export default LibmpvVideo
+export default LibmpvView

package/src/{LibmpvVideo.types.ts → LibmpvViewTypes.ts}

@@ -1,4 +1,4 @@
-export type LibmpvVideoViewProps = {
+export type LibmpvViewProps = {
   ref: any,
   style: any,
   playUrl: string,
@@ -13,7 +13,7 @@ export type LibmpvVideoViewProps = {
   onLibmpvLog: (libmpvLog: any) => void,
 };
 
-export type LibmpvNativeMethods = {
+export type LibmpvViewNativeMethods = {
   runCommand: (pipeDelimitedArguments: string) => void | Promise<void>;
   setOptionString: (pipeDelimitedArguments: string) => void | Promise<void>;
 };

package/src/index.ts

@@ -1,2 +1,14 @@
-export { default as LibmpvVideo } from './LibmpvVideoView';
-export * from './LibmpvVideo.types';
+import { default as Libmpv } from './Libmpv'
+export { default as Libmpv } from './Libmpv'
+
+import { default as LibmpvView } from './LibmpvView';
+export { default as LibmpvView } from './LibmpvView';
+
+import * as LibmpvViewTypes from './LibmpvViewTypes';
+export * as LibmpvViewTypes from './LibmpvViewTypes';
+
+export default {
+    Module: Libmpv,
+    View: LibmpvView,
+    Types: LibmpvViewTypes
+}

package/build/LibmpvVideo.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LibmpvVideo.types.d.ts","sourceRoot":"","sources":["../src/LibmpvVideo.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,CAAC,WAAW,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,WAAW,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,CAAC,sBAAsB,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,eAAe,EAAE,CAAC,sBAAsB,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E,CAAC"}

package/build/LibmpvVideo.types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=LibmpvVideo.types.js.map

package/build/LibmpvVideo.types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LibmpvVideo.types.js","sourceRoot":"","sources":["../src/LibmpvVideo.types.ts"],"names":[],"mappings":"","sourcesContent":["export type LibmpvVideoViewProps = {\n  ref: any,\n  style: any,\n  playUrl: string,\n  isPlaying: boolean,\n  useHardwareDecoder: boolean,\n  selectedAudioTrack: number,\n  selectedSubtitleTrack: number,\n  seekToSeconds: number,\n  surfaceWidth: number,\n  surfaceHeight: number,\n  onLibmpvEvent: (libmpvEvent: any) => void,\n  onLibmpvLog: (libmpvLog: any) => void,\n};\n\nexport type LibmpvNativeMethods = {\n  runCommand: (pipeDelimitedArguments: string) => void | Promise<void>;\n  setOptionString: (pipeDelimitedArguments: string) => void | Promise<void>;\n};"]}

package/build/LibmpvVideoView.d.ts

@@ -1,5 +0,0 @@
-import * as React from 'react';
-import { LibmpvVideoViewProps, LibmpvNativeMethods } from './LibmpvVideo.types';
-export declare const LibmpvVideo: React.ForwardRefExoticComponent<Omit<LibmpvVideoViewProps, "ref"> & React.RefAttributes<LibmpvNativeMethods>>;
-export default LibmpvVideo;
-//# sourceMappingURL=LibmpvVideoView.d.ts.map

package/build/LibmpvVideoView.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LibmpvVideoView.d.ts","sourceRoot":"","sources":["../src/LibmpvVideoView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAmChF,eAAO,MAAM,WAAW,+GAsDtB,CAAA;AAEF,eAAe,WAAW,CAAA"}

package/build/LibmpvVideoView.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LibmpvVideoView.js","sourceRoot":"","sources":["../src/LibmpvVideoView.tsx"],"names":[],"mappings":"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","sourcesContent":["import { requireNativeView } from 'expo';\nimport * as React from 'react';\n\nimport { LibmpvVideoViewProps, LibmpvNativeMethods } from './LibmpvVideo.types';\n\nconst styles: any = {\n  videoPlayer: {\n    position: \"absolute\",\n    left: 0,\n    bottom: 0,\n    right: 0,\n    top: 0\n  }\n};\n\nconst EVENT_LOOKUP: any = {\n  0: 'NONE',\n  1: 'SHUTDOWN',\n  2: 'LOG_MESSAGE',\n  3: 'GET_PROPERTY_REPLY',\n  4: 'SET_PROPERTY_REPLY',\n  5: 'COMMAND_REPLY',\n  6: 'START_FILE',\n  7: 'END_FILE',\n  8: 'FILE_LOADED',\n  16: 'CLIENT_MESSAGE',\n  17: 'VIDEO_RECONFIG',\n  18: 'AUDIO_RECONFIG',\n  20: 'SEEK',\n  21: 'PLAYBACK_RESTART',\n  22: 'PROPERTY_CHANGE',\n  24: 'QUEUE_OVERFLOW',\n  25: 'HOOK'\n}\n\nconst LibmpvVideoView: React.ComponentType<LibmpvVideoViewProps> =\n  requireNativeView('LibmpvVideo');\n\nexport const LibmpvVideo = React.forwardRef<LibmpvNativeMethods, LibmpvVideoViewProps>((props: any, parentRef: any) => {\n  React.useEffect(() => {\n    return () => {\n      if (parentRef?.current?.cleanup) {\n        parentRef.current.cleanup();\n      }\n    };\n  }, []);\n\n  // Pass mpv events and logs back up to the parent\n  const onLogEvent = (libmpvEvent: any) => {\n    if (props.onLibmpvEvent) {\n      if (libmpvEvent && libmpvEvent.nativeEvent) {\n        libmpvEvent = libmpvEvent.nativeEvent\n      }\n      if (libmpvEvent.eventId) {\n        libmpvEvent.value = parseInt(libmpvEvent.eventId, 10)\n        libmpvEvent.eventKind = EVENT_LOOKUP[libmpvEvent.eventId]\n      }\n      else if (libmpvEvent.kind === 'long' || libmpvEvent.kind === 'double') {\n        libmpvEvent.value = Number(libmpvEvent.value)\n      }\n      else if (libmpvEvent.kind === 'boolean') {\n        libmpvEvent.value = libmpvEvent.value === 'true'\n      }\n      return props.onLibmpvEvent(libmpvEvent)\n    }\n  }\n  const onLibmpvLog = (libmpvLog: any) => {\n    if (props.onLibmpvLog) {\n      if (libmpvLog && libmpvLog.nativeEvent) {\n        libmpvLog = libmpvLog.nativeEvent\n      }\n      return props.onLibmpvLog(libmpvLog);\n    }\n  }\n\n  // The order props are handled in the native code is non-deterministic\n  // Each native prop setter checks to see if all required props are set\n  // Only then will it try to create an instance of mpv\n  return <LibmpvVideoView\n    ref={parentRef}\n    style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer}\n    playUrl={props.playUrl}\n    isPlaying={props.isPlaying}\n    useHardwareDecoder={props.useHardwareDecoder}\n    surfaceWidth={props.surfaceWidth}\n    surfaceHeight={props.surfaceHeight}\n    selectedAudioTrack={props.selectedAudioTrack}\n    selectedSubtitleTrack={props.selectedSubtitleTrack}\n    seekToSeconds={props.seekToSeconds}\n    onLibmpvEvent={onLogEvent}\n    onLibmpvLog={onLibmpvLog}\n  />\n})\n\nexport default LibmpvVideo\n"]}