Shared KMP core and UI, switch to Koin

2026-10-25 20:28:07 +03:00
parent f63b09a9d3
commit 69048452b8
161 changed files with 6626 additions and 4485 deletions
--- a/playback/engine-vlc/build.gradle.kts
+++ b/playback/engine-vlc/build.gradle.kts
@@ -1,7 +1,5 @@
 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.hilt)
 }

 android {
@@ -16,9 +14,8 @@ android {

 dependencies {
    implementation(project(":playback:api"))
+    implementation(project(":core:common"))
    implementation(libs.libvlc)
    implementation(libs.okhttp)
-    implementation(libs.hilt.android)
-    ksp(libs.hilt.compiler)
-    implementation(libs.timber)
+    implementation(libs.koin.android)
 }
--- a/playback/engine-vlc/src/main/kotlin/ru/stenfredd/sleepyowl/playback/vlc/LoopbackProxy.kt
+++ b/playback/engine-vlc/src/main/kotlin/ru/stenfredd/sleepyowl/playback/vlc/LoopbackProxy.kt
@@ -7,7 +7,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import timber.log.Timber
+import ru.stenfredd.sleepyowl.core.common.Log
 import java.io.BufferedInputStream
 import java.io.Closeable
 import java.io.IOException
@@ -88,7 +88,7 @@ internal class LoopbackProxy(private val client: OkHttpClient) : Closeable {
            val socket = try {
                server.accept()
            } catch (e: IOException) {
-                if (!closed) Timber.w(e, "VLC proxy: accept failed")
+                if (!closed) Log.w(e, "VLC proxy: accept failed")
                break
            }
            val connection = Connection(socket, requestCounter.incrementAndGet())
@@ -126,7 +126,7 @@ internal class LoopbackProxy(private val client: OkHttpClient) : Closeable {
                call?.cancel()
                runCatching { socket.close() }
                connections -= this
-                Timber.d("VLC proxy #%d %s (%d ms)", id, summary, SystemClock.elapsedRealtime() - started)
+                Log.d("VLC proxy #%d %s (%d ms)", id, summary, SystemClock.elapsedRealtime() - started)
            }
        }

--- a/playback/engine-vlc/src/main/kotlin/ru/stenfredd/sleepyowl/playback/vlc/VlcEngine.kt
+++ b/playback/engine-vlc/src/main/kotlin/ru/stenfredd/sleepyowl/playback/vlc/VlcEngine.kt
@@ -21,6 +21,8 @@ import org.videolan.libvlc.Media
 import org.videolan.libvlc.MediaPlayer
 import org.videolan.libvlc.interfaces.IMedia
 import org.videolan.libvlc.util.VLCVideoLayout
+import ru.stenfredd.sleepyowl.core.common.Log
+import ru.stenfredd.sleepyowl.playback.api.AndroidVideoOutput
 import ru.stenfredd.sleepyowl.playback.api.AudioDelayCapable
 import ru.stenfredd.sleepyowl.playback.api.Codecs
 import ru.stenfredd.sleepyowl.playback.api.DeviceCapabilities
@@ -34,10 +36,11 @@ import ru.stenfredd.sleepyowl.playback.api.SubtitleDelayCapable
 import ru.stenfredd.sleepyowl.playback.api.SubtitleStyle
 import ru.stenfredd.sleepyowl.playback.api.SubtitleStyleable
 import ru.stenfredd.sleepyowl.playback.api.embeddedOrdinal
+import ru.stenfredd.sleepyowl.playback.api.encodingName
+import ru.stenfredd.sleepyowl.playback.api.passthroughEncoding
 import ru.stenfredd.sleepyowl.playback.api.stream
 import ru.stenfredd.sleepyowl.playback.api.streams
 import ru.stenfredd.sleepyowl.playback.api.videoStream
-import timber.log.Timber

 /**
 * libVLC engine. Owns its LibVLC instance so every playback starts clean and releases all native
@@ -45,7 +48,7 @@ import timber.log.Timber
 * All network access goes through [LoopbackProxy]: libVLC itself only sees plain HTTP on 127.0.0.1.
 */
 class VlcEngine(context: Context, httpClient: OkHttpClient, private val device: DeviceCapabilities) :
-    PlaybackEngine, AudioDelayCapable, SubtitleDelayCapable, SubtitleStyleable {
+    PlaybackEngine, AndroidVideoOutput, AudioDelayCapable, SubtitleDelayCapable, SubtitleStyleable {
    override val id = VlcEngineProvider.ID

    private val appContext = context.applicationContext
@@ -91,13 +94,13 @@ class VlcEngine(context: Context, httpClient: OkHttpClient, private val device:
    private val dialogCallbacks = object : Dialog.Callbacks {
        override fun onDisplay(dialog: Dialog.ErrorMessage) {
            lastDialogError = "${dialog.title}: ${dialog.text}"
-            Timber.w("VLC error dialog: %s", lastDialogError)
+            Log.w("VLC error dialog: %s", lastDialogError)
            _stats.update { it.copy(extra = it.extra + ("vlc" to lastDialogError.orEmpty())) }
        }
        override fun onDisplay(dialog: Dialog.LoginDialog) = dialog.dismiss()
        override fun onDisplay(dialog: Dialog.QuestionDialog) {
            // E.g. an untrusted TLS certificate. Never accept silently.
-            Timber.w("VLC question dialog dismissed: %s / %s", dialog.title, dialog.text)
+            Log.w("VLC question dialog dismissed: %s / %s", dialog.title, dialog.text)
            lastDialogError = "${dialog.title}: ${dialog.text}"
            dialog.dismiss()
        }
@@ -195,14 +198,14 @@ class VlcEngine(context: Context, httpClient: OkHttpClient, private val device:
        val landed = time - elapsed.coerceAtMost(time)
        val error = seekTargetMs - landed
        if (error in -SEEK_TOLERANCE_MS..SEEK_TOLERANCE_MS || seekAttempts >= MAX_SEEK_CORRECTIONS) {
-            if (seekAttempts > 0) Timber.i("VLC seek to %d s: landed at %d s after %d corrections", seekTargetMs / 1000, landed / 1000, seekAttempts)
+            if (seekAttempts > 0) Log.i("VLC seek to %d s: landed at %d s after %d corrections", seekTargetMs / 1000, landed / 1000, seekAttempts)
            seekTargetMs = -1
            return
        }
        seekAttempts++
        seekRequestMs = (seekRequestMs + error).coerceAtLeast(0)
        seekIssuedAt = SystemClock.elapsedRealtime()
-        Timber.i("VLC seek to %d s landed at %d s, retrying with %d s", seekTargetMs / 1000, landed / 1000, seekRequestMs / 1000)
+        Log.i("VLC seek to %d s landed at %d s, retrying with %d s", seekTargetMs / 1000, landed / 1000, seekRequestMs / 1000)
        player.setTime(seekRequestMs, false)
    }

@@ -234,7 +237,7 @@ class VlcEngine(context: Context, httpClient: OkHttpClient, private val device:
            player.setAudioOutputDevice(mode)
        }
        val label = if (passthrough) "passthrough ${Codecs.encodingName(encoding!!)}" else "PCM стерео (${codec ?: "?"})"
-        Timber.i("VLC audio output: %s", label)
+        Log.i("VLC audio output: %s", label)
        _stats.update { it.copy(audioOutput = label) }
    }

@@ -275,11 +278,11 @@ class VlcEngine(context: Context, httpClient: OkHttpClient, private val device:
            req.mediaSource.embeddedOrdinal(streamIndex, MediaStreamType.SUBTITLE)?.let(tracks::getOrNull)
        }
        if (track == null) {
-            Timber.d("VLC subtitle %d not there yet (spu tracks: %s)", streamIndex, tracks.joinToString { "${it.id} ${it.name}" })
+            Log.d("VLC subtitle %d not there yet (spu tracks: %s)", streamIndex, tracks.joinToString { "${it.id} ${it.name}" })
            pendingSubtitle = streamIndex
            return
        }
-        Timber.i("VLC subtitle %d -> track %d «%s»", streamIndex, track.id, track.name)
+        Log.i("VLC subtitle %d -> track %d «%s»", streamIndex, track.id, track.name)
        player.setSpuTrack(track.id)
    }

@@ -320,7 +323,7 @@ class VlcEngine(context: Context, httpClient: OkHttpClient, private val device:
            m?.release()
            player.release()
            libVlc.release()
-            Timber.i("libVLC released in %d ms", SystemClock.elapsedRealtime() - started)
+            Log.i("libVLC released in %d ms", SystemClock.elapsedRealtime() - started)
        }, "vlc-release").start()
    }

@@ -400,7 +403,7 @@ class VlcEngine(context: Context, httpClient: OkHttpClient, private val device:
    private fun reportError(error: EngineError) {
        if (errorReported) return
        errorReported = true
-        Timber.w("VLC error: %s", error.message)
+        Log.w("VLC error: %s", error.message)
        _events.tryEmit(EngineEvent.Error(error))
    }

--- a/playback/engine-vlc/src/main/kotlin/ru/stenfredd/sleepyowl/playback/vlc/VlcEngineModule.kt
+++ b/playback/engine-vlc/src/main/kotlin/ru/stenfredd/sleepyowl/playback/vlc/VlcEngineModule.kt
@@ -1,16 +1,10 @@
 package ru.stenfredd.sleepyowl.playback.vlc

-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import dagger.multibindings.IntoSet
+import org.koin.android.ext.koin.androidContext
+import org.koin.dsl.bind
+import org.koin.dsl.module
 import ru.stenfredd.sleepyowl.playback.api.EngineProvider

-@Module
-@InstallIn(SingletonComponent::class)
-abstract class VlcEngineModule {
-    @Binds
-    @IntoSet
-    abstract fun bindProvider(provider: VlcEngineProvider): EngineProvider
+val vlcEngineModule = module {
+    single { VlcEngineProvider(androidContext()) } bind EngineProvider::class
 }
--- a/playback/engine-vlc/src/main/kotlin/ru/stenfredd/sleepyowl/playback/vlc/VlcEngineProvider.kt
+++ b/playback/engine-vlc/src/main/kotlin/ru/stenfredd/sleepyowl/playback/vlc/VlcEngineProvider.kt
@@ -1,7 +1,6 @@
 package ru.stenfredd.sleepyowl.playback.vlc

 import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
 import org.jellyfin.sdk.model.api.DeviceProfile
 import org.jellyfin.sdk.model.api.DlnaProfileType
 import org.jellyfin.sdk.model.api.EncodingContext
@@ -22,12 +21,9 @@ import ru.stenfredd.sleepyowl.playback.api.Verdict
 import ru.stenfredd.sleepyowl.playback.api.videoStream
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import javax.inject.Singleton

-@Singleton
-class VlcEngineProvider @Inject constructor(
-    @ApplicationContext private val context: Context,
+class VlcEngineProvider(
+    private val context: Context,
 ) : EngineProvider {
    override val id = ID
    override val displayName = "VLC"