refactor: make use of mpv_node and new flows in mpv-lib (#271)

Author: abdallahmehiz

app/build.gradle.kts

@@ -100,6 +100,12 @@ android {
   }
 }
 
+kotlin {
+  compilerOptions {
+    freeCompilerArgs.addAll("-Xwhen-guards", "-Xcontext-parameters")
+  }
+}
+
 room {
   schemaDirectory("$projectDir/schemas")
 }

app/src/main/java/live/mehiz/mpvkt/App.kt

@@ -1,6 +1,7 @@
 package live.mehiz.mpvkt
 
 import android.app.Application
+import live.mehiz.mpvkt.di.AppModule
 import live.mehiz.mpvkt.di.DatabaseModule
 import live.mehiz.mpvkt.di.FileManagerModule
 import live.mehiz.mpvkt.di.PreferencesModule
@@ -22,6 +23,7 @@ class App : Application(), KoinStartup {
   override fun onKoinStartup() = koinConfiguration {
     androidContext(this@App)
     modules(
+      AppModule,
       PreferencesModule,
       DatabaseModule,
       FileManagerModule,

app/src/main/java/live/mehiz/mpvkt/di/AppModule.kt

@@ -0,0 +1,14 @@
+package live.mehiz.mpvkt.di
+
+import kotlinx.serialization.json.Json
+import org.koin.dsl.module
+
+// generic dependencies for the app's needs
+val AppModule = module {
+  single {
+    Json {
+      isLenient = true
+      ignoreUnknownKeys = true
+    }
+  }
+}

app/src/main/java/live/mehiz/mpvkt/ui/home/HomeScreen.kt

@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.FileOpen
 import androidx.compose.material.icons.filled.FolderOpen
@@ -27,6 +28,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -79,27 +81,25 @@ object HomeScreen : Screen {
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
       ) {
-        var uri by remember { mutableStateOf("") }
+        val uri = rememberTextFieldState()
         var isUrlValid by remember { mutableStateOf(true) }
+        LaunchedEffect(uri.text) {
+          isUrlValid = uri.text.isNotEmpty() || isURLValid(uri.text.toString())
+        }
         OutlinedTextField(
-          value = uri,
+          state = uri,
           label = { Text(stringResource(R.string.home_url_input_label)) },
-          onValueChange = {
-            uri = it
-            isUrlValid = it.isBlank() || isURLValid(it)
-          },
           supportingText = {
             Text(if (isUrlValid) "" else stringResource(R.string.home_invalid_protocol))
           },
           trailingIcon = {
             if (!isUrlValid) Icon(Icons.Filled.Info, null)
           },
-          isError = !isUrlValid,
-          maxLines = 5,
+          isError = !isUrlValid
         )
         Button(
-          onClick = { playFile(uri, context) },
-          enabled = uri.isNotBlank() && isUrlValid,
+          onClick = { playFile(uri.text.toString(), context) },
+          enabled = uri.text.isNotBlank() && isUrlValid,
         ) {
           Row(
             horizontalArrangement = Arrangement.spacedBy(MaterialTheme.spacing.smaller),

app/src/main/java/live/mehiz/mpvkt/ui/player/MPVView.kt

@@ -30,37 +30,6 @@ class MPVView(context: Context, attributes: AttributeSet) : BaseMPVView(context,
 
   var isExiting = false
 
-  val duration: Int?
-    get() = MPVLib.getPropertyInt("duration")
-
-  var timePos: Int?
-    get() = MPVLib.getPropertyInt("time-pos")
-    set(position) = MPVLib.setPropertyInt("time-pos", position!!)
-
-  var paused: Boolean?
-    get() = MPVLib.getPropertyBoolean("pause")
-    set(paused) = MPVLib.setPropertyBoolean("pause", paused!!)
-
-  val hwdecActive: String
-    get() = MPVLib.getPropertyString("hwdec-current") ?: "no"
-
-  var playbackSpeed: Double?
-    get() = MPVLib.getPropertyDouble("speed")
-    set(speed) = MPVLib.setPropertyDouble("speed", speed!!)
-
-  var subDelay: Double?
-    get() = MPVLib.getPropertyDouble("sub-delay")
-    set(delay) = MPVLib.setPropertyDouble("sub-delay", delay!!)
-
-  var secondarySubDelay: Double?
-    get() = MPVLib.getPropertyDouble("secondary-sub-delay")
-    set(delay) = MPVLib.setPropertyDouble("secondary-sub-delay", delay!!)
-
-  val videoH: Int?
-    get() = MPVLib.getPropertyInt("video-params/h")
-  val videoAspect: Double?
-    get() = MPVLib.getPropertyDouble("video-params/aspect")
-
   /**
    * Returns the video aspect ratio. Rotation is taken into account.
    */
@@ -78,11 +47,7 @@ class MPVView(context: Context, attributes: AttributeSet) : BaseMPVView(context,
       return v?.toIntOrNull() ?: -1
     }
     operator fun setValue(thisRef: Any?, property: KProperty<*>, value: Int) {
-      if (value == -1) {
-        MPVLib.setPropertyString(name, "no")
-      } else {
-        MPVLib.setPropertyInt(name, value)
-      }
+      if (value == -1) MPVLib.setPropertyString(name, "no") else MPVLib.setPropertyInt(name, value)
     }
   }
 
@@ -134,14 +99,14 @@ class MPVView(context: Context, attributes: AttributeSet) : BaseMPVView(context,
   override fun postInitOptions() {
     when (decoderPreferences.debanding.get()) {
       Debanding.None -> {}
-      Debanding.CPU -> MPVLib.command(arrayOf("vf", "add", "@deband:gradfun=radius=12"))
+      Debanding.CPU -> MPVLib.command("vf", "add", "@deband:gradfun=radius=12")
       Debanding.GPU -> MPVLib.setOptionString("deband", "yes")
     }
 
     advancedPreferences.enabledStatisticsPage.get().let {
       if (it != 0) {
-        MPVLib.command(arrayOf("script-binding", "stats/display-stats-toggle"))
-        MPVLib.command(arrayOf("script-binding", "stats/display-page-$it"))
+        MPVLib.command("script-binding", "stats/display-stats-toggle")
+        MPVLib.command("script-binding", "stats/display-page-$it")
       }
     }
   }
@@ -152,7 +117,7 @@ class MPVView(context: Context, attributes: AttributeSet) : BaseMPVView(context,
       return false
     }
 
-    var mapped = KeyMapping.map.get(event.keyCode)
+    var mapped = KeyMapping[event.keyCode]
     if (mapped == null) {
       // Fallback to produced glyph
       if (!event.isPrintingKey) {
@@ -181,35 +146,14 @@ class MPVView(context: Context, attributes: AttributeSet) : BaseMPVView(context,
 
     val action = if (event.action == KeyEvent.ACTION_DOWN) "keydown" else "keyup"
     mod.add(mapped)
-    MPVLib.command(arrayOf(action, mod.joinToString("+")))
+    MPVLib.command(action, mod.joinToString("+"))
 
     return true
   }
 
   private val observedProps = mapOf(
-    "chapter" to MPVLib.mpvFormat.MPV_FORMAT_INT64,
-    "chapter-list" to MPVLib.mpvFormat.MPV_FORMAT_NONE,
-    "track-list" to MPVLib.mpvFormat.MPV_FORMAT_NONE,
-
-    "time-pos" to MPVLib.mpvFormat.MPV_FORMAT_INT64,
-    "demuxer-cache-time" to MPVLib.mpvFormat.MPV_FORMAT_INT64,
-    "duration" to MPVLib.mpvFormat.MPV_FORMAT_INT64,
-    "volume" to MPVLib.mpvFormat.MPV_FORMAT_INT64,
-    "volume-max" to MPVLib.mpvFormat.MPV_FORMAT_INT64,
-
-    "sid" to MPVLib.mpvFormat.MPV_FORMAT_STRING,
-    "secondary-sid" to MPVLib.mpvFormat.MPV_FORMAT_STRING,
-    "aid" to MPVLib.mpvFormat.MPV_FORMAT_STRING,
-
-    "speed" to MPVLib.mpvFormat.MPV_FORMAT_DOUBLE,
-    "video-params/aspect" to MPVLib.mpvFormat.MPV_FORMAT_DOUBLE,
-
-    "hwdec-current" to MPVLib.mpvFormat.MPV_FORMAT_STRING,
-    "hwdec" to MPVLib.mpvFormat.MPV_FORMAT_STRING,
-
     "pause" to MPVLib.mpvFormat.MPV_FORMAT_FLAG,
-    "paused-for-cache" to MPVLib.mpvFormat.MPV_FORMAT_FLAG,
-    "seeking" to MPVLib.mpvFormat.MPV_FORMAT_FLAG,
+    "video-params/aspect" to MPVLib.mpvFormat.MPV_FORMAT_DOUBLE,
     "eof-reached" to MPVLib.mpvFormat.MPV_FORMAT_FLAG,
 
     "user-data/mpvkt/show_text" to MPVLib.mpvFormat.MPV_FORMAT_STRING,

app/src/main/java/live/mehiz/mpvkt/ui/player/MediaPlaybackService.kt

@@ -23,6 +23,7 @@ import androidx.core.app.NotificationCompat
 import androidx.media.MediaBrowserServiceCompat
 import androidx.media.session.MediaButtonReceiver
 import `is`.xyz.mpv.MPVLib
+import `is`.xyz.mpv.MPVNode
 import live.mehiz.mpvkt.R
 import live.mehiz.mpvkt.preferences.GesturePreferences
 import org.koin.android.ext.android.inject
@@ -45,21 +46,25 @@ class MediaPlaybackService : MediaBrowserServiceCompat(), MPVLib.EventObserver {
   private val binder = MediaPlaybackBinder()
   private var mediaTitle = ""
   private var mediaArtist = ""
-  private var positionMs: Long
-    get() = (MPVLib.getPropertyDouble("time-pos") * 1000L).toLong()
-    set(value) = MPVLib.command(arrayOf("seek", (value / 1000f).toString(), "absolute"))
-  private val durationMs: Long
-    get() = (MPVLib.getPropertyDouble("duration") * 1000L).toLong()
-  private var paused: Boolean
+  private var positionMs: Long?
+    get() = MPVLib.getPropertyDouble("time-pos")?.times(1000L)?.toLong()
+    set(value) = MPVLib.command("seek", (value!! / 1000f).toString(), "absolute")
+  private val durationMs: Long?
+    get() = (MPVLib.getPropertyDouble("duration")?.times(1000L))?.toLong()
+  private var paused: Boolean?
     get() = MPVLib.getPropertyBoolean("pause")
-    set(value) = MPVLib.command(arrayOf("set", "pause", if (value) "yes" else "no"))
+    set(value) = MPVLib.command("set", "pause", if (value == true) "yes" else "no")
 
   private lateinit var mediaSession: MediaSessionCompat
 
   private lateinit var audioManager: AudioManager
   private var audioFocusRequest: AudioFocusRequest? = null
   private var audioFocusCallback: AudioManager.OnAudioFocusChangeListener? = null
 
+  init {
+    MPVLib.addObserver(this)
+  }
+
   @Suppress("EmptyFunctionBlock")
   override fun eventProperty(property: String) {
   }
@@ -86,6 +91,7 @@ class MediaPlaybackService : MediaBrowserServiceCompat(), MPVLib.EventObserver {
         updateMediaSessionMetadata()
         updateNotification()
       }
+
       "media-title" -> {
         mediaTitle = value
         updateMediaSessionMetadata()
@@ -98,6 +104,10 @@ class MediaPlaybackService : MediaBrowserServiceCompat(), MPVLib.EventObserver {
   override fun eventProperty(property: String, value: Double) {
   }
 
+  @Suppress("EmptyFunctionBlock")
+  override fun eventProperty(property: String, value: MPVNode) {
+  }
+
   @Suppress("EmptyFunctionBlock")
   override fun event(eventId: Int) {
   }
@@ -111,8 +121,17 @@ class MediaPlaybackService : MediaBrowserServiceCompat(), MPVLib.EventObserver {
   override fun onCreate() {
     super.onCreate()
 
-    audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
+    audioManager = getSystemService(AUDIO_SERVICE) as AudioManager
     MPVLib.addObserver(this)
+    mapOf(
+      "pause" to MPVLib.mpvFormat.MPV_FORMAT_FLAG,
+      "duration" to MPVLib.mpvFormat.MPV_FORMAT_DOUBLE,
+      "time-pos" to MPVLib.mpvFormat.MPV_FORMAT_DOUBLE,
+      "media-title" to MPVLib.mpvFormat.MPV_FORMAT_STRING,
+      "metadata/artist" to MPVLib.mpvFormat.MPV_FORMAT_STRING,
+    ).onEach {
+      MPVLib.observeProperty(it.key, it.value)
+    }
 
     setupMediaSession()
     setupAudioFocus()
@@ -213,7 +232,7 @@ class MediaPlaybackService : MediaBrowserServiceCompat(), MPVLib.EventObserver {
       when (focusChange) {
         AudioManager.AUDIOFOCUS_LOSS -> pauseMedia()
         AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> pauseMedia()
-        AudioManager.AUDIOFOCUS_GAIN -> if (!paused) playMedia()
+        AudioManager.AUDIOFOCUS_GAIN -> if (paused == false) playMedia()
       }
     }
 
@@ -284,19 +303,19 @@ class MediaPlaybackService : MediaBrowserServiceCompat(), MPVLib.EventObserver {
   }
 
   private fun seekForward() {
-    positionMs += gesturePreferences.doubleTapToSeekDuration.get() * 1000L
+    positionMs = positionMs?.plus(gesturePreferences.doubleTapToSeekDuration.get() * 1000L)
   }
 
   private fun seekBackward() {
-    positionMs -= gesturePreferences.doubleTapToSeekDuration.get() * 1000L
+    positionMs = positionMs?.minus(gesturePreferences.doubleTapToSeekDuration.get() * 1000L)
   }
 
   private fun updateMediaSessionMetadata() {
     try {
       val metadataBuilder = MediaMetadataCompat.Builder()
         .putString(MediaMetadataCompat.METADATA_KEY_TITLE, mediaTitle)
         .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, mediaArtist)
-        .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, durationMs)
+        .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, durationMs ?: 0L)
         .putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE, mediaTitle)
         .putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, mediaTitle.hashCode().toString())
 
@@ -316,7 +335,15 @@ class MediaPlaybackService : MediaBrowserServiceCompat(), MPVLib.EventObserver {
     try {
       val stateBuilder = PlaybackStateCompat.Builder()
         .setActions(getAvailableActions())
-        .setState(if (paused) PlaybackStateCompat.STATE_PAUSED else PlaybackStateCompat.STATE_PLAYING, positionMs, 1.0f)
+        .setState(
+          if (paused == true) {
+            PlaybackStateCompat.STATE_PAUSED
+          } else {
+            PlaybackStateCompat.STATE_PLAYING
+          },
+          positionMs ?: 0,
+          1.0f,
+        )
 
       mediaSession.setPlaybackState(stateBuilder.build())
     } catch (e: Exception) {
@@ -374,12 +401,12 @@ class MediaPlaybackService : MediaBrowserServiceCompat(), MPVLib.EventObserver {
       .setContentIntent(pendingOpenAppIntent)
       .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
       .setOnlyAlertOnce(true)
-      .setOngoing(!paused)
+      .setOngoing(paused == false)
       .addAction(R.drawable.baseline_fast_rewind_24, getString(R.string.notification_rewind), pendingSkipBackwardIntent)
       .addAction(
-        if (!paused) R.drawable.baseline_pause_24 else R.drawable.baseline_play_arrow_24,
-        if (!paused) getString(R.string.notification_pause) else getString(R.string.notification_play),
-        if (!paused) pendingPauseIntent else pendingPlayIntent,
+        if (paused == false) R.drawable.baseline_pause_24 else R.drawable.baseline_play_arrow_24,
+        if (paused == false) getString(R.string.notification_pause) else getString(R.string.notification_play),
+        if (paused == false) pendingPauseIntent else pendingPlayIntent,
       )
       .addAction(
         R.drawable.baseline_fast_forward_24,