Merge b0327fd224 into 0bf0e1816c

.github/workflows/spotube-release-binary.yml

@@ -659,16 +659,6 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x gradlew
 
-      # MobileVLCKit comes from CocoaPods; iosApp/Pods/ is gitignored and the workspace needs it.
-      - name: Cache CocoaPods
-        uses: actions/cache@v6
-        with:
-          path: iosApp/Pods
-          key: pods-${{ runner.os }}-${{ hashFiles('iosApp/Podfile.lock') }}
-
-      - name: Install CocoaPods dependencies
-        run: pod install --deployment --project-directory=iosApp
-
       # Unsigned on purpose: there is no Apple developer account in CI. The IPA is meant for sideloading
       # (AltStore, Sideloadly, ...), which re-signs it with the user's own certificate.
       # The Gradle build phase inside Xcode reads these as project properties.
@@ -678,7 +668,7 @@ jobs:
           ORG_GRADLE_PROJECT_buildNumber: ${{ github.run_number }}
         run: >
           xcodebuild
-          -workspace iosApp/iosApp.xcworkspace
+          -project iosApp/iosApp.xcodeproj
           -scheme iosApp
           -configuration Release
           -sdk iphoneos

.gitignore

@@ -16,7 +16,6 @@ captures
 !*.xcodeproj/project.xcworkspace/
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
-iosApp/Pods/
 node_modules/
 composeApp/release/
 

AGENTS.md

@@ -8,7 +8,6 @@
 - Desktop/JVM: `composeApp/src/jvmMain/kotlin/org/spotube/spotube/main.kt` (`mainClass = org.spotube.spotube.MainKt`).
 - Android: `composeApp/src/androidMain/kotlin/org/spotube/spotube/MainActivity.kt`.
 - iOS bridge: `composeApp/src/iosMain/kotlin/org/spotube/spotube/MainViewController.kt` and `iosApp/iosApp/ContentView.swift`.
-- iOS audio: MobileVLCKit from CocoaPods (`iosApp/Podfile`), driven by `iosApp/iosApp/VlcPlayerEngine.swift` through `NativePlayerEngine` (iosMain). Run `pod install` in `iosApp/` first, then build `iosApp/iosApp.xcworkspace` (not the `.xcodeproj`, which can't build the Pods). Android Studio's iOS run config must point at the workspace too.
 
 ## High-value commands
 - Use Gradle wrapper (`./gradlew` or `./gradlew.bat`) only.

composeApp/build.gradle.kts

@@ -449,7 +449,7 @@ nucleus.application {
         "--enable-native-access=ALL-UNNAMED", // need for JNA for compose-webview (wry) to work
         // --- ADD THESE FOR SPEED & LOW RAM ---
         "-Xms64m",                  // Start with a tiny heap (prevents grabbing 500MB upfront)
-        "-Xmx1g",                   // Ceiling, not a reservation: the heap only grows to what is live (#3200, #3193)
+        "-Xmx384m",                 // Cap the max heap (VLC and WebView need a bit of room)
         "-XX:TieredStopAtLevel=1",  // Disables the heavy C2 compiler. Huge startup speedup!
         "-XX:+UseSerialGC"          // The Serial GC is the most efficient for heaps under 512MB
     )
@@ -556,7 +556,7 @@ nucleus.application {
         // ProGuard is not used for native images; -Os is the size equivalent
         optimization = NativeImageOptimization.SIZE
         // Same ceiling as the JVM distribution's -Xmx
-        maxHeapSize = "1g"
+        maxHeapSize = "384m"
         // Skiko is loaded from lib/ next to the binary (Nucleus copies it there); don't embed
         // a second ~30 MB copy as a resource
         buildArgs.add("-H:+UnlockExperimentalVMOptions")

composeApp/src/commonMain/kotlin/org/spotube/spotube/core/audioplayer/AudioPlayerModels.kt

@@ -21,7 +21,6 @@ import org.spotube.plugin_interfaces.plugin_apis.audio.StreamProtocol
 import org.spotube.plugin_interfaces.plugin_apis.metadata.track.MetadataTrack
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import kotlin.time.Duration
 
 data class MediaItem(
@@ -85,9 +84,7 @@ sealed interface QueueEntry {
         val artists: List<String>,
         val duration: Long,
         val album: String?,
-        // Not persisted: the queue is saved on every change and covers made it hundreds of MB
-        // of JSON (#3193). Restore fills them back in from the local media index.
-        @Transient val coverBytes: ByteArray? = null,
+        val coverBytes: ByteArray?,
         override val url: String,
         override val addedBy: String = "") : QueueEntry {
         override val artworkUrl: String? get() = null

composeApp/src/commonMain/kotlin/org/spotube/spotube/core/audioplayer/DeviceAudioPlayerQueue.kt

@@ -20,10 +20,8 @@ package org.spotube.spotube.core.audioplayer
 import org.spotube.plugin_interfaces.plugin_apis.audio.StreamProtocol
 import org.spotube.spotube.core.di.injectLogger
 import org.spotube.spotube.modules.blacklist.BlacklistRepository
-import org.spotube.spotube.modules.library.local_tracks.media.LocalMediaCacheRepository
 import org.spotube.spotube.modules.plugin.PluginProvider
 import org.spotube.spotube.modules.settings.SettingsProvider
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
@@ -39,7 +37,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
 import kotlin.random.Random
 import kotlin.time.Duration.Companion.milliseconds
 
@@ -133,15 +130,14 @@ class DeviceAudioPlayerQueue(
         startPosition: Int,
         collectionEntry: QueueCollectionEntry?) {
         logger.i { "Loading queue with ${entries.size} entries, autoPlay=$autoPlay, startPosition=$startPosition" }
-        val resolved = resolveMediaItems(entries)
-        val mediaItems = resolved.map { it.first }
+        val mediaItems = entries.mapNotNull { it.toMediaItem() }
         if (mediaItems.isEmpty()) {
             logger.w { "load: no valid media items after filtering blanks" }
         }
         val normalizedStartPosition =
             if (mediaItems.isEmpty()) 0 else startPosition.coerceIn(0, mediaItems.lastIndex)
         logger.d { "Normalized start position: $startPosition -> $normalizedStartPosition" }
-        entryByMediaUrl.value = entriesByUrl(resolved)
+        entryByMediaUrl.value = mediaItems.associate { it.url to entries.firstOrNull { e -> e.toMediaItem()?.url == it.url }!! }
         updateCollectionContext(collectionEntry)
         audioPlayer.load(mediaItems, autoPlay, normalizedStartPosition)
         persistQueueStateIfReady()
@@ -405,66 +401,19 @@ class DeviceAudioPlayerQueue(
             return
         }
 
-        val restored = resolveMediaItems(withLocalCovers(state.entries))
-        if (restored.isEmpty()) {
+        val mediaItems = state.entries.mapNotNull { it.toMediaItem() }
+        if (mediaItems.isEmpty()) {
             logger.w { "restorePersistedState: all entries had blank urls" }
             return
         }
-        val mediaItems = restored.map { it.first }
-        entryByMediaUrl.value = entriesByUrl(restored)
+        entryByMediaUrl.value = mediaItems.associate { it.url to state.entries.firstOrNull { e -> e.toMediaItem()?.url == it.url }!! }
         val normalizedStartPosition = state.currentIndex.coerceIn(0, mediaItems.lastIndex)
         logger.d { "Loading restored playlist with normalized start position: ${state.currentIndex} -> $normalizedStartPosition" }
         audioPlayer.load(mediaItems, autoPlay = false, startPosition = normalizedStartPosition)
         logger.i { "Persisted state restored successfully" }
     }
 
-    /**
-     * Converts each entry once. Looking every item's entry up again by converting the whole list
-     * per item was quadratic: ~900k suspending conversions to start a 1353-track playlist.
-     */
-    private suspend fun resolveMediaItems(entries: List<QueueEntry>): List<Pair<MediaItem, QueueEntry>> =
-        entries.mapNotNull { entry -> entry.toMediaItem()?.let { it to entry } }
-
-    /** First entry wins for a repeated url, as before. */
-    private fun entriesByUrl(resolved: List<Pair<MediaItem, QueueEntry>>): Map<String, QueueEntry> = buildMap {
-        resolved.forEach { (item, entry) -> if (item.url !in this) put(item.url, entry) }
-    }
-
-    /** Local covers aren't persisted with the queue; look them up in the local media index. */
-    private suspend fun withLocalCovers(entries: List<QueueEntry>): List<QueueEntry> {
-        if (entries.none { it is QueueEntry.LocalTrack }) return entries
-        val covers = runCatching {
-            get<LocalMediaCacheRepository>().cacheFlow.first().folders
-                .flatMap { it.tracks }
-                .mapNotNull { track -> track.coverBytes?.let { track.path to it } }
-                .toMap()
-        }.getOrElse {
-            logger.w(it) { "Couldn't read local media index for queue covers" }
-            emptyMap()
-        }
-        if (covers.isEmpty()) return entries
-        return entries.map { entry ->
-            if (entry is QueueEntry.LocalTrack && entry.coverBytes == null) {
-                covers[entry.url]?.let { entry.copy(coverBytes = it) } ?: entry
-            } else entry
-        }
-    }
-
-    /**
-     * Runs from fire-and-forget collectors on a scope without an exception handler, where a
-     * failed write (disk full, I/O error) would otherwise crash the app. Losing one save is fine.
-     */
     private suspend fun persistQueueStateIfReady() {
-        try {
-            persistQueueState()
-        } catch (e: CancellationException) {
-            throw e
-        } catch (e: Exception) {
-            logger.e(e) { "Failed to persist queue state" }
-        }
-    }
-
-    private suspend fun persistQueueState() {
         if (isRestoringPersistedState) {
             logger.v { "Skipping persist: still restoring persisted state" }
             return

composeApp/src/commonMain/kotlin/org/spotube/spotube/core/db/Database.kt

@@ -61,13 +61,13 @@ class Database(val paths: Paths) {
 
     val audioPlayerQueueDataStore: DataStore<Preferences> by lazy {
         PreferenceDataStoreFactory.createWithPath(
-            produceFile = { dropIfOversized("${paths.getApplicationDataDirPath()}/spotube_audio_player_queue.preferences_pb".toPath()) }
+            produceFile = { "${paths.getApplicationDataDirPath()}/spotube_audio_player_queue.preferences_pb".toPath() }
         )
     }
 
     val localMediaDataStore: DataStore<Preferences> by lazy {
         PreferenceDataStoreFactory.createWithPath(
-            produceFile = { dropIfOversized("${paths.getApplicationDataDirPath()}/spotube_local_media.preferences_pb".toPath()) }
+            produceFile = { "${paths.getApplicationDataDirPath()}/spotube_local_media.preferences_pb".toPath() }
         )
     }
 
@@ -83,23 +83,7 @@ class Database(val paths: Paths) {
         )
     }
 
-    /**
-     * DataStore reads a whole preferences file into the heap. Earlier builds stored full-size
-     * embedded covers as JSON number arrays in the queue and local media stores, growing them to
-     * hundreds of MB and crashing with OutOfMemoryError on load (#3193). Both are rebuildable, so
-     * drop one that is far past any sane size instead of loading it.
-     */
-    private fun dropIfOversized(path: okio.Path): okio.Path {
-        runCatching {
-            val size = FileSystem.SYSTEM.metadataOrNull(path)?.size ?: return path
-            if (size > MAX_CACHE_STORE_BYTES) FileSystem.SYSTEM.delete(path)
-        }
-        return path
-    }
-
     private companion object {
-        const val MAX_CACHE_STORE_BYTES = 8L * 1024 * 1024
-
         /** Preference files written by previous launches; their presence means an upgrade. */
         val EXISTING_INSTALL_PROBE_FILES = listOf(
             "spotube.preferences_pb",

composeApp/src/commonMain/kotlin/org/spotube/spotube/core/server/CacheManager.kt

@@ -196,18 +196,22 @@ class CacheManager(
                 val (start, end) = range
                 val length = end - start + 1
                 val contentRange = "bytes $start-$end/$fileSize"
-                call.respond(object : OutgoingContent.WriteChannelContent() {
-                    override val status: HttpStatusCode = HttpStatusCode.PartialContent
-                    override val contentLength: Long = length
-                    override val contentType: ContentType = entry.toContentType()
-                    override val headers: Headers = HeadersBuilder().apply {
-                        append(HttpHeaders.ContentRange, contentRange)
-                        append(HttpHeaders.AcceptRanges, "bytes")
-                    }.build()
-                    override suspend fun writeTo(channel: io.ktor.utils.io.ByteWriteChannel) {
-                        streamFileRange(fileSystem, filePath, start, length, channel)
-                    }
-                })
+                fileSystem.source(filePath).buffer().use { source ->
+                    source.skip(start)
+                    val bytes = source.readByteArray(length)
+                    call.respond(object : OutgoingContent.WriteChannelContent() {
+                        override val status: HttpStatusCode = HttpStatusCode.PartialContent
+                        override val contentLength: Long = bytes.size.toLong()
+                        override val contentType: ContentType = entry.toContentType()
+                        override val headers: Headers = HeadersBuilder().apply {
+                            append(HttpHeaders.ContentRange, contentRange)
+                            append(HttpHeaders.AcceptRanges, "bytes")
+                        }.build()
+                        override suspend fun writeTo(channel: io.ktor.utils.io.ByteWriteChannel) {
+                            channel.writeFully(bytes)
+                        }
+                    })
+                }
                 return
             }
             call.respond(object : OutgoingContent.NoContent() {
@@ -219,42 +223,19 @@ class CacheManager(
             return
         }
 
-        call.respond(object : OutgoingContent.WriteChannelContent() {
-            override val status: HttpStatusCode = HttpStatusCode.OK
-            override val contentLength: Long = fileSize
-            override val contentType: ContentType = entry.toContentType()
-            override val headers: Headers = HeadersBuilder().apply {
-                append(HttpHeaders.AcceptRanges, "bytes")
-            }.build()
-            override suspend fun writeTo(channel: io.ktor.utils.io.ByteWriteChannel) {
-                streamFileRange(fileSystem, filePath, 0, fileSize, channel)
-            }
-        })
-    }
-
-}
-
-private const val STREAM_CHUNK_BYTES = 64 * 1024
-
-/**
- * Copies [length] bytes from [start] in fixed-size chunks. Cached tracks are tens of MB and the
- * player re-requests them on every seek, so they must never be read into the heap whole.
- */
-internal suspend fun streamFileRange(
-    fileSystem: FileSystem,
-    filePath: Path,
-    start: Long,
-    length: Long,
-    channel: io.ktor.utils.io.ByteWriteChannel) {
-    fileSystem.source(filePath).buffer().use { source ->
-        source.skip(start)
-        val chunk = ByteArray(STREAM_CHUNK_BYTES)
-        var remaining = length
-        while (remaining > 0) {
-            val read = source.read(chunk, 0, minOf(chunk.size.toLong(), remaining).toInt())
-            if (read == -1) break
-            channel.writeFully(chunk, 0, read)
-            remaining -= read
+        fileSystem.source(filePath).buffer().use { source ->
+            val bytes = source.readByteArray()
+            call.respond(object : OutgoingContent.WriteChannelContent() {
+                override val status: HttpStatusCode = HttpStatusCode.OK
+                override val contentLength: Long = bytes.size.toLong()
+                override val contentType: ContentType = entry.toContentType()
+                override val headers: Headers = HeadersBuilder().apply {
+                    append(HttpHeaders.AcceptRanges, "bytes")
+                }.build()
+                override suspend fun writeTo(channel: io.ktor.utils.io.ByteWriteChannel) {
+                    channel.writeFully(bytes)
+                }
+            })
         }
     }
 }

composeApp/src/commonMain/kotlin/org/spotube/spotube/core/server/StreamingUrlRepository.kt

@@ -23,9 +23,11 @@ import org.spotube.plugin_interfaces.plugin_apis.audio.AudioQuality
 import org.spotube.plugin_interfaces.plugin_apis.audio.AudioStream
 import org.spotube.plugin_interfaces.plugin_apis.audio.StreamProtocol
 import org.spotube.plugin_interfaces.plugin_apis.metadata.track.MetadataTrack
+import org.spotube.spotube.PlatformType
 import org.spotube.spotube.core.audioplayer.AudioPlayerQueue
 import org.spotube.spotube.core.audioplayer.QueueEntry
 import org.spotube.spotube.core.di.injectLogger
+import org.spotube.spotube.getPlatform
 import org.spotube.spotube.modules.plugin.AudioPluginSource
 import org.spotube.spotube.modules.settings.UserSettingsSource
 import kotlinx.coroutines.flow.filterNotNull
@@ -78,7 +80,8 @@ class StreamingUrlRepository(
     private val audioPlayerQueue: AudioPlayerQueue,
     private val matchedTracksRepository: TrackSourceRepository,
     private val settingsRepository: UserSettingsSource,
-    private val streamUrlCacheTtlMs: Long = 30.seconds.inWholeMilliseconds) : KoinComponent {
+    private val streamUrlCacheTtlMs: Long = 30.seconds.inWholeMilliseconds,
+    private val platform: PlatformType = currentPlatform) : KoinComponent {
 
     private val logger by injectLogger<StreamingUrlRepository>()
     private val streamUrlCacheMutex = Mutex()
@@ -143,7 +146,7 @@ class StreamingUrlRepository(
             } else {
                 stream.streams
             }
-            return selectPreferredAudioStream(candidates, preferredFormat, preferredQuality)
+            return selectPreferredAudioStream(candidates, preferredFormat, preferredQuality, platform)
                 .also { logSelection(trackId, origin, candidates, preferredFormat, preferredQuality, it) }
         }
 
@@ -253,11 +256,12 @@ class StreamingUrlRepository(
         logger.i {
             "[Resolve $trackId] selecting from ${streams.size} candidates ($origin), " +
                 "want ${preferredFormat.codec}/${preferredFormat.container} $preferredQuality " +
-                "(rank key = formatMismatch, qualityTypeMismatch, qualityDistance, channelDistance; " +
+                "(rank key = unplayable, formatMismatch, qualityTypeMismatch, qualityDistance, channelDistance; " +
                 "lowest wins):\n" +
                 streams.joinToString("\n") { stream ->
                     val marker = if (stream === selected) "  -> " else "     "
-                    "$marker${stream.describeForLog()} key=(${formatMismatchCount(stream, preferredFormat)}, " +
+                    "$marker${stream.describeForLog()} key=(${if (stream.isPlayableOn(platform)) 0 else 1}, " +
+                        "${formatMismatchCount(stream, preferredFormat)}, " +
                         "${if (stream.matchesQualityType(preferredQuality)) 0 else 1}, " +
                         "${stream.qualityDistance(preferredQuality).let { if (it == Long.MAX_VALUE) "inf" else "$it" }}, " +
                         "${stream.channelDistance(preferredQuality)}) ${urlSummary(stream.url)}"
@@ -265,6 +269,10 @@ class StreamingUrlRepository(
         }
         when {
             selected == null -> logger.w { "[Resolve $trackId] no stream selected" }
+            !selected.isPlayableOn(platform) -> logger.w {
+                "[Resolve $trackId] NO PLAYABLE STREAM on $platform; falling back to " +
+                    "${selected.describeForLog()}, which the player will likely reject"
+            }
             formatMismatchCount(selected, preferredFormat) > 0 -> logger.w {
                 "[Resolve $trackId] FORMAT FALLBACK: wanted ${preferredFormat.codec}/${preferredFormat.container}, " +
                     "got ${selected.codec}/${selected.container} (${selected.protocol})"
@@ -392,16 +400,21 @@ internal fun normalizeManifestUrl(url: String, protocol: StreamProtocol): String
     }
 }
 
+internal val currentPlatform: PlatformType by lazy { getPlatform().type }
+
 /**
- * Selects the available stream closest to the user's preferred format and quality. Every
- * platform's player (ExoPlayer on Android, VLC elsewhere including iOS) can play any container,
- * codec and protocol plugins return, so nothing is ruled out up front.
+ * Selects the available stream closest to the user's preferred format and quality.
+ * Streams the [platform]'s player can decode always win over ones it can't, whatever the
+ * preferences say: e.g. opus/webm is unplayable on iOS.
  */
 internal fun selectPreferredAudioStream(
     streams: List<AudioStream>,
     preferredFormat: AudioFormat,
-    preferredQuality: AudioQuality): AudioStream? = streams.minWithOrNull(
+    preferredQuality: AudioQuality,
+    platform: PlatformType = currentPlatform): AudioStream? = streams.minWithOrNull(
     compareBy<AudioStream> { stream ->
+        if (stream.isPlayableOn(platform)) 0 else 1
+    }.thenBy { stream ->
         formatMismatchCount(stream, preferredFormat)
     }.thenBy { stream ->
         if (stream.matchesQualityType(preferredQuality)) 0 else 1
@@ -412,6 +425,25 @@ internal fun selectPreferredAudioStream(
     }
 )
 
+private val MATROSKA_CONTAINERS = setOf("webm", "mkv", "matroska")
+
+// Containers a platform's player can't open, so e.g. YouTube's opus/webm streams fail to load there.
+private val UNSUPPORTED_CONTAINERS: Map<PlatformType, Set<String>> = mapOf(
+    // AVPlayer has no WebM/Ogg/Matroska demuxer.
+    PlatformType.IOS to MATROSKA_CONTAINERS + setOf("ogg", "oga"))
+
+/**
+ * Whether [platform]'s player can play this stream. ExoPlayer (Android) and VLC elsewhere handle
+ * everything plugins return; AVPlayer (iOS) can't demux WebM/Ogg and can't play DASH.
+ */
+internal fun AudioStream.isPlayableOn(platform: PlatformType): Boolean =
+    isContainerPlayableOn(container, platform) &&
+        !(platform == PlatformType.IOS && protocol == StreamProtocol.DASH)
+
+/** Whether [platform]'s player can open [container] at all; see [AudioStream.isPlayableOn]. */
+internal fun isContainerPlayableOn(container: String, platform: PlatformType): Boolean =
+    container.lowercase() !in UNSUPPORTED_CONTAINERS[platform].orEmpty()
+
 private fun formatMismatchCount(stream: AudioStream, preferredFormat: AudioFormat): Int =
     (if (stream.codec.equals(preferredFormat.codec, ignoreCase = true)) 0 else 1) +
         (if (stream.container.equals(preferredFormat.container, ignoreCase = true)) 0 else 1)

composeApp/src/commonMain/kotlin/org/spotube/spotube/core/ui/component/TrackList.kt

@@ -46,7 +46,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -81,7 +80,6 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.layout.layout
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
@@ -98,7 +96,6 @@ import org.spotube.plugin_interfaces.plugin_apis.metadata.artist.MetadataArtist
 import org.spotube.plugin_interfaces.plugin_apis.metadata.common.Thumbnail
 import org.spotube.plugin_interfaces.plugin_apis.metadata.track.MetadataTrack
 import org.spotube.spotube.core.ui.misc.SkeletonTree
-import org.spotube.spotube.core.ui.misc.uniqueLazyKeys
 import org.spotube.spotube.core.ui.misc.TextWithShimmer
 import org.spotube.spotube.core.ui.misc.shimmerApply
 import org.spotube.spotube.getPlatform
@@ -122,42 +119,6 @@ private val CompactTrackListBreakpoint = 600.dp
 private val LargeTrackListBreakpoint = 840.dp
 private const val ShimmerRowCount = 6
 
-private val TrackCardOuterPadding = 8.dp
-private val TrackCardInnerPadding = 12.dp
-private const val TrackCardTopKey = "track-card-top"
-private const val TrackCardRowKeyPrefix = "track-card-row:"
-private const val TrackCardFooterKey = "track-card-footer"
-private const val TrackCardBottomKey = "track-card-bottom"
-
-private fun Any.isTrackCardKey() = this is String && startsWith("track-card-")
-
-/**
- * Sizes the card drawn behind a [TrackList]'s rows to the rows the list has laid out. Edges that
- * are scrolled away are pushed a few viewports past the screen, far enough that the card's rounded
- * corners, shadow and edge gradient stay off-screen, while the height stays bounded for huge lists.
- */
-private fun Modifier.trackCardBounds(listState: LazyListState, edgeInsetPx: Int): Modifier =
-    layout { measurable, constraints ->
-        val info = listState.layoutInfo
-        val cardItems = info.visibleItemsInfo.filter { it.key.isTrackCardKey() }
-        if (cardItems.isEmpty()) return@layout layout(constraints.maxWidth, constraints.maxHeight) {}
-
-        // Item offsets are relative to the viewport start, which is negative by the top padding.
-        val toLocal = -info.viewportStartOffset
-        val viewport = info.viewportEndOffset - info.viewportStartOffset
-        val overscan = viewport * 3
-        val first = cardItems.first()
-        val last = cardItems.last()
-        val top = if (first.key == TrackCardTopKey) first.offset + toLocal + edgeInsetPx else -overscan
-        val bottom = if (last.key == TrackCardBottomKey) {
-            last.offset + last.size + toLocal - edgeInsetPx
-        } else viewport + overscan
-        val height = (bottom - top).coerceAtLeast(0)
-        val placeable = measurable.measure(
-            constraints.copy(minHeight = height, maxHeight = height))
-        layout(constraints.maxWidth, constraints.maxHeight) { placeable.place(0, top) }
-    }
-
 enum class TrackSortOption(val label: StringResource) {
     None(Res.string.track_list_sort_original),
     Title(Res.string.track_list_sort_title),
@@ -237,7 +198,7 @@ fun TrackList(
     val shouldLoadMore = remember(density) {
         derivedStateOf {
             val loadMoreThreshold = with(density) { 200.dp.toPx() }
-            val cardItem = listState.layoutInfo.visibleItemsInfo.find { it.key == TrackCardBottomKey }
+            val cardItem = listState.layoutInfo.visibleItemsInfo.find { it.key == "track-card" }
             // Trigger when the bottom of the track card is close to/inside the viewport,
             // which means the user has scrolled through (or is about to scroll through)
             // all loaded tracks.
@@ -258,124 +219,115 @@ fun TrackList(
     val showAlbum = !isCompact
     val useDropdownForOptions = isDesktop && !isCompact
 
-    val trackRow: @Composable (Int, MetadataTrack) -> Unit = { displayedIndex, track ->
-        TrackListRow(
-            index = displayedIndex + 1,
-            track = track,
-            showIndex = showIndex,
-            showAlbum = showAlbum,
-            useDropdownForOptions = useDropdownForOptions,
-            isCurrentTrack = track.id == currentTrackId,
-            // Only the current row depends on it, so play/pause/buffering flips don't recompose every row.
-            isCurrentTrackPlaying = isCurrentTrackPlaying && track.id == currentTrackId,
-            isSelectionMode = isSelectionMode,
-            isSelected = selectedTrackIds.contains(track.id),
-            onTrackClick = {
-                if (isSelectionMode) {
-                    selectedTrackIds =
-                        if (selectedTrackIds.contains(track.id)) {
-                            selectedTrackIds - track.id
-                        } else {
-                            selectedTrackIds + track.id
-                        }
-                } else if (isJamGuest) {
-                    onTrackOptionsAction(track, TrackOptionsAction.AddToJam)
-                } else {
-                    onTrackClick(track)
-                }
-            },
-            onLongClick = {
-                if (!useDropdownForOptions && !isSelectionMode) {
-                    isSelectionMode = true
-                    selectedTrackIds = setOf(track.id)
-                } else if (!useDropdownForOptions) {
-                    selectedTrackForOptions = track
-                }
-            },
-            onSelectionToggle = { checked ->
-                isSelectionMode = true
-                selectedTrackIds = if (checked) {
-                    selectedTrackIds + track.id
-                } else {
-                    selectedTrackIds - track.id
-                }
-            },
-            onTrackOptionsAction = { action ->
-                onTrackOptionsAction(
-                    track,
-                    action
-                )
-            },
-            trackOptionsState = trackOptionsState(track),
-            isInJam = isInJam,
-            isJamGuest = isJamGuest,
-            onShowOptionsClick = { selectedTrackForOptions = track },
-            onArtistClick = onArtistClick,
-            onAlbumClick = onAlbumClick,
-            onArtistsOverflowClick = { onArtistsOverflowClick(track) })
-    }
-
-    // Shimmer, error, empty and next-page rows at the end of the card.
-    val trackCardFooter: @Composable () -> Unit = {
-        if (isLoading && tracks.isEmpty()) {
-            repeat(ShimmerRowCount) { shimmerIndex ->
-                if (visibleTracks.isNotEmpty() || shimmerIndex > 0) {
-                    MillenniumSeparator(
-                        modifier = Modifier.padding(horizontal = 8.dp))
-                }
-                ShimmerTrackListRow(
-                    index = shimmerIndex + 1,
-                    showIndex = showIndex,
-                    showAlbum = showAlbum,
-                    useDropdownForOptions = useDropdownForOptions)
-            }
-        }
-
-        if (error != null) {
-            if (visibleTracks.isNotEmpty()) {
-                MillenniumSeparator(
-                    modifier = Modifier.padding(horizontal = 8.dp))
-            }
-            TrackListFeedbackRow(
-                message = error,
-                isError = true)
-        }
-
-        if (showEmptyMessage && !isLoading && visibleTracks.isEmpty() && error == null) {
-            TrackListFeedbackRow(stringResource(Res.string.track_list_no_tracks))
-        }
-
-        if (isLoadingNextPage) {
-            if (visibleTracks.isNotEmpty()) {
-                MillenniumSeparator(
-                    modifier = Modifier.padding(horizontal = 8.dp))
-            }
-            ShimmerTrackListRow(
-                index = visibleTracks.size + 1,
-                showIndex = showIndex,
-                showAlbum = showAlbum,
-                useDropdownForOptions = useDropdownForOptions)
-        }
-    }
-
     val trackCardContent: @Composable () -> Unit = {
         MillenniumCard(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(vertical = TrackCardOuterPadding),
+                .padding(vertical = 8.dp),
             contentPadding = PaddingValues(0.dp)) {
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(top = TrackCardInnerPadding, bottom = TrackCardInnerPadding)
+                    .padding(top = 12.dp, bottom = 12.dp)
             ) {
                 visibleTracks.forEachIndexed { displayedIndex, track ->
                     if (displayedIndex > 0) {
                         MillenniumSeparator()
                     }
-                    trackRow(displayedIndex, track)
+                    TrackListRow(
+                        index = displayedIndex + 1,
+                        track = track,
+                        showIndex = showIndex,
+                        showAlbum = showAlbum,
+                        useDropdownForOptions = useDropdownForOptions,
+                        isCurrentTrack = track.id == currentTrackId,
+                        isCurrentTrackPlaying = isCurrentTrackPlaying,
+                        isSelectionMode = isSelectionMode,
+                        isSelected = selectedTrackIds.contains(track.id),
+                        onTrackClick = {
+                            if (isSelectionMode) {
+                                selectedTrackIds =
+                                    if (selectedTrackIds.contains(track.id)) {
+                                        selectedTrackIds - track.id
+                                    } else {
+                                        selectedTrackIds + track.id
+                                    }
+                            } else if (isJamGuest) {
+                                onTrackOptionsAction(track, TrackOptionsAction.AddToJam)
+                            } else {
+                                onTrackClick(track)
+                            }
+                        },
+                        onLongClick = {
+                            if (!useDropdownForOptions && !isSelectionMode) {
+                                isSelectionMode = true
+                                selectedTrackIds = setOf(track.id)
+                            } else if (!useDropdownForOptions) {
+                                selectedTrackForOptions = track
+                            }
+                        },
+                        onSelectionToggle = { checked ->
+                            isSelectionMode = true
+                            selectedTrackIds = if (checked) {
+                                selectedTrackIds + track.id
+                            } else {
+                                selectedTrackIds - track.id
+                            }
+                        },
+                        onTrackOptionsAction = { action ->
+                            onTrackOptionsAction(
+                                track,
+                                action
+                            )
+                        },
+                        trackOptionsState = trackOptionsState(track),
+                        isInJam = isInJam,
+                        isJamGuest = isJamGuest,
+                        onShowOptionsClick = { selectedTrackForOptions = track },
+                        onArtistClick = onArtistClick,
+                        onAlbumClick = onAlbumClick,
+                        onArtistsOverflowClick = { onArtistsOverflowClick(track) })
+                }
+
+                if (isLoading && tracks.isEmpty()) {
+                    repeat(ShimmerRowCount) { shimmerIndex ->
+                        if (visibleTracks.isNotEmpty() || shimmerIndex > 0) {
+                            MillenniumSeparator(
+                                modifier = Modifier.padding(horizontal = 8.dp))
+                        }
+                        ShimmerTrackListRow(
+                            index = shimmerIndex + 1,
+                            showIndex = showIndex,
+                            showAlbum = showAlbum,
+                            useDropdownForOptions = useDropdownForOptions)
+                    }
+                }
+
+                if (error != null) {
+                    if (visibleTracks.isNotEmpty()) {
+                        MillenniumSeparator(
+                            modifier = Modifier.padding(horizontal = 8.dp))
+                    }
+                    TrackListFeedbackRow(
+                        message = error,
+                        isError = true)
+                }
+
+                if (showEmptyMessage && !isLoading && visibleTracks.isEmpty() && error == null) {
+                    TrackListFeedbackRow(stringResource(Res.string.track_list_no_tracks))
+                }
+
+                if (isLoadingNextPage) {
+                    if (visibleTracks.isNotEmpty()) {
+                        MillenniumSeparator(
+                            modifier = Modifier.padding(horizontal = 8.dp))
+                    }
+                    ShimmerTrackListRow(
+                        index = visibleTracks.size + 1,
+                        showIndex = showIndex,
+                        showAlbum = showAlbum,
+                        useDropdownForOptions = useDropdownForOptions)
                 }
-                trackCardFooter()
             }
         }
     }
@@ -502,57 +454,29 @@ fun TrackList(
 
     if (scrollable) {
         Box(modifier = modifier.fillMaxWidth()) {
-          Box(
-              modifier = Modifier
-                  .widthIn(max = 1280.dp)
-                  .align(Alignment.TopCenter)
-                  .padding(horizontal = if (isCompact) 6.dp else 16.dp, vertical = 8.dp)) {
-            // Rows are separate lazy items (only on-screen ones are composed, #3200), so the card
-            // they sit on is drawn once behind the list, spanning the card's laid-out items.
-            MillenniumCard(
-                modifier = Modifier
-                    .matchParentSize()
-                    .trackCardBounds(listState, with(density) { TrackCardOuterPadding.roundToPx() }),
-                contentPadding = PaddingValues(0.dp)) {}
-            // No arrangement spacing: it would also open gaps between the card's rows. The 2.dp
-            // gaps around the card are applied to the items before and after it instead.
             LazyColumn(
                 state = listState,
-                contentPadding = contentPadding) {
+                modifier = Modifier
+                    .widthIn(max = 1280.dp)
+                    .align(Alignment.TopCenter)
+                    .padding(horizontal = if (isCompact) 6.dp else 16.dp, vertical = 8.dp),
+                contentPadding = contentPadding,
+                verticalArrangement = Arrangement.spacedBy(2.dp)) {
                 if (headerContent != null) {
                     item {
-                        Box(Modifier.padding(bottom = 2.dp)) { headerContent() }
+                        headerContent()
                     }
                 }
                 if (!simplified) {
-                    item { Box(Modifier.padding(bottom = 2.dp)) { filterSortRow() } }
-                }
-                item(key = TrackCardTopKey) {
-                    Spacer(Modifier.fillMaxWidth().height(TrackCardOuterPadding + TrackCardInnerPadding))
-                }
-                // Plugin ids can repeat (the same track twice in a playlist).
-                val rowKeys = uniqueLazyKeys(visibleTracks) { it.id }
-                items(visibleTracks.size, key = { TrackCardRowKeyPrefix + rowKeys[it] }) { displayedIndex ->
-                    Column(Modifier.fillMaxWidth()) {
-                        if (displayedIndex > 0) {
-                            MillenniumSeparator()
-                        }
-                        trackRow(displayedIndex, visibleTracks[displayedIndex])
-                    }
-                }
-                item(key = TrackCardFooterKey) {
-                    Column(Modifier.fillMaxWidth()) { trackCardFooter() }
-                }
-                item(key = TrackCardBottomKey) {
-                    Spacer(Modifier.fillMaxWidth().height(TrackCardInnerPadding + TrackCardOuterPadding))
+                    item { filterSortRow() }
                 }
+                item(key = "track-card") { trackCardContent() }
                 if (footerContent != null) {
                     item {
-                        Box(Modifier.padding(top = 2.dp)) { footerContent() }
+                        footerContent()
                     }
                 }
             }
-          }
 
             if (!useDropdownForOptions) {
                 selectedTrackForOptions?.let { track ->

composeApp/src/commonMain/kotlin/org/spotube/spotube/core/ui/misc/UniqueLazyKeys.kt

@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2026 Kingkor Roy Tirtho and Spotube Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.spotube.spotube.core.ui.misc
-
-import androidx.compose.foundation.lazy.LazyItemScope
-import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.lazy.grid.LazyGridItemScope
-import androidx.compose.foundation.lazy.grid.LazyGridScope
-import androidx.compose.runtime.Composable
-
-/*
- * Lazy lists crash when two items share a key ("Key ... was already used", #3196). Ids that come
- * from plugins can be blank or repeat (the same playlist twice in a library page, a track added
- * twice), so lists keyed on them use these instead of `items(list, key = { it.id })`.
- */
-
-private const val DUPLICATE_SEPARATOR = '\u0000'
-
-/**
- * One key per item: an item keeps its id the first time it appears, so scroll position and
- * animations stay stable; blank ids and repeats get an occurrence suffix that can't collide with
- * a real id.
- */
-fun <T> uniqueLazyKeys(items: List<T>, id: (T) -> String): List<String> {
-    val occurrences = HashMap<String, Int>(items.size)
-    return items.map { item ->
-        val base = id(item)
-        val occurrence = occurrences[base] ?: 0
-        occurrences[base] = occurrence + 1
-        if (occurrence == 0 && base.isNotEmpty()) base else "$base$DUPLICATE_SEPARATOR$occurrence"
-    }
-}
-
-fun <T> LazyListScope.itemsWithUniqueKeys(
-    items: List<T>,
-    id: (T) -> String,
-    keyPrefix: String = "",
-    itemContent: @Composable LazyItemScope.(T) -> Unit
-) {
-    val keys = uniqueLazyKeys(items, id)
-    items(items.size, key = { keyPrefix + keys[it] }) { itemContent(items[it]) }
-}
-
-fun <T> LazyGridScope.itemsWithUniqueKeys(
-    items: List<T>,
-    id: (T) -> String,
-    keyPrefix: String = "",
-    itemContent: @Composable LazyGridItemScope.(T) -> Unit
-) {
-    val keys = uniqueLazyKeys(items, id)
-    items(items.size, key = { keyPrefix + keys[it] }) { itemContent(items[it]) }
-}

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/artist/ArtistScreen.kt

@@ -18,7 +18,6 @@
 package org.spotube.spotube.modules.artist
 
 
-import org.spotube.spotube.core.ui.misc.itemsWithUniqueKeys
 import org.spotube.millennium.composables.MillenniumIcon
 import org.spotube.millennium.composables.MillenniumButton
 import org.spotube.millennium.composables.MillenniumButtonStyle
@@ -639,7 +638,7 @@ private fun AlbumsSection(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
         verticalAlignment = Alignment.Top
     ) {
-        itemsWithUniqueKeys(albums, id = { it.id }) { album ->
+        items(albums, key = { it.id }) { album ->
             AlbumCard(album = album)
         }
     }
@@ -677,7 +676,7 @@ private fun RelatedArtistsSection(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
         verticalAlignment = Alignment.Top
     ) {
-        itemsWithUniqueKeys(artists, id = { it.id }) { artist ->
+        items(artists, key = { it.id }) { artist ->
             ArtistCard(artist = artist)
         }
     }
@@ -715,7 +714,7 @@ private fun FeaturedPlaylistsSection(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
         verticalAlignment = Alignment.Top
     ) {
-        itemsWithUniqueKeys(playlists, id = { it.id }) { playlist ->
+        items(playlists, key = { it.id }) { playlist ->
             PlaylistCard(playlist = playlist)
         }
     }

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/library/LibraryMediaCollection.kt

@@ -3,7 +3,6 @@
  */
 package org.spotube.spotube.modules.library
 
-import org.spotube.spotube.core.ui.misc.itemsWithUniqueKeys
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -59,7 +58,7 @@ internal fun <T> LibraryMediaCollection(
             if (loading) items(8) { SkeletonTree(true) { skeleton(true) } }
             else {
                 if (header != null) item(key = "library_header") { header(true) }
-                itemsWithUniqueKeys(items, id = itemKey, keyPrefix = "media:") { itemContent(it, true) }
+                items(items, key = { "media:${itemKey(it)}" }) { itemContent(it, true) }
                 if (loadingMore) items(4) { SkeletonTree(true) { skeleton(true) } }
             }
         }
@@ -72,7 +71,7 @@ internal fun <T> LibraryMediaCollection(
             if (loading) items(8) { SkeletonTree(true) { skeleton(false) } }
             else {
                 if (header != null) item(key = "library_header") { header(false) }
-                itemsWithUniqueKeys(items, id = itemKey, keyPrefix = "media:") { itemContent(it, false) }
+                items(items, key = { "media:${itemKey(it)}" }) { itemContent(it, false) }
                 if (loadingMore) items(4) { SkeletonTree(true) { skeleton(false) } }
             }
         }

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/library/playlist/AddToPlaylistPicker.kt

@@ -18,7 +18,6 @@
 package org.spotube.spotube.modules.library.playlist
 
 
-import org.spotube.spotube.core.ui.misc.itemsWithUniqueKeys
 import org.spotube.spotube.core.ui.component.AdaptiveDialogBottomSheet
 import org.spotube.millennium.composables.MillenniumIcon
 import org.spotube.millennium.composables.MillenniumButton
@@ -196,7 +195,7 @@ private fun PlaylistPickerContent(
         LazyColumn(
             modifier = Modifier.fillMaxWidth(),
             verticalArrangement = Arrangement.spacedBy(4.dp)) {
-            itemsWithUniqueKeys(playlists, id = { it.id }) { playlist ->
+            items(playlists, key = { it.id }) { playlist ->
                 PlaylistPickerRow(
                     playlist = playlist,
                     onClick = { onPlaylistSelected(playlist.id) })

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/playlist/AddTracksToPlaylistDialog.kt

@@ -18,7 +18,6 @@
 package org.spotube.spotube.modules.playlist
 
 
-import org.spotube.spotube.core.ui.misc.itemsWithUniqueKeys
 import org.spotube.spotube.core.ui.component.AdaptiveDialogBottomSheet
 import org.spotube.millennium.composables.MillenniumCircularProgress
 import org.spotube.millennium.composables.MillenniumIcon
@@ -139,7 +138,7 @@ fun AddTracksToPlaylistDialog(
                             .fillMaxWidth()
                             .weight(1f),
                         verticalArrangement = Arrangement.spacedBy(4.dp)) {
-                        itemsWithUniqueKeys(state.results, id = { it.track.id }) { result ->
+                        items(state.results, key = { it.track.id }) { result ->
                             TrackSearchResultRow(
                                 track = result.track,
                                 isAdding = result.isAdding,

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/saved_tracks/SavedTracksRepository.kt

@@ -50,14 +50,6 @@ class SavedTracksRepository(
 
     val savedTracksIdsFlow : StateFlow<Set<String>> = savedTrackIds.asStateFlow()
 
-    /**
-     * Bumped only when the library itself changes (save, remove, re-login). [savedTracksIdsFlow]
-     * also grows while pages and saved-states are fetched, so reloading the list on it restarted
-     * paging on every page (#3200).
-     */
-    private val _libraryChanges = MutableStateFlow(0)
-    val libraryChanges: StateFlow<Int> = _libraryChanges.asStateFlow()
-
     init {
         scope.launch {
             pluginManager.selectedMetadataPlugin
@@ -79,7 +71,6 @@ class SavedTracksRepository(
         savedTracksCache.invalidateAll()
         totalCountCache.invalidateAll()
         savedTrackIds.value = emptySet()
-        _libraryChanges.value++
     }
 
     suspend fun getSavedTracks(paginationStrategy: PaginationStrategy? = null) =
@@ -118,7 +109,6 @@ class SavedTracksRepository(
             savedTracksCache.invalidateAll()
             totalCountCache.invalidateAll()
             savedTrackIds.value += ids.toSet()
-            _libraryChanges.value++
         }
     }
 
@@ -132,7 +122,6 @@ class SavedTracksRepository(
             savedTracksCache.invalidateAll()
             totalCountCache.invalidateAll()
             savedTrackIds.value -= ids.toSet()
-            _libraryChanges.value++
         }
     }
 

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/saved_tracks/SavedTracksViewModel.kt

@@ -152,7 +152,7 @@ class SavedTracksViewModel(
                     .filterNotNull()
                     .flatMapLatest { it.loggedInFlow }
                     .distinctUntilChanged(),
-                repository.libraryChanges
+                repository.savedTracksIdsFlow
             ) { _, _ -> }.collect {
                 loadInitialData()
                 loadCurrentUser()

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/settings/SettingsModels.kt

@@ -17,6 +17,9 @@
 
 package org.spotube.spotube.modules.settings
 
+import org.spotube.spotube.core.server.isContainerPlayableOn
+import org.spotube.spotube.core.server.currentPlatform
+import org.spotube.spotube.PlatformType
 import org.spotube.plugin_interfaces.plugin_apis.audio.AudioFormat
 import org.spotube.plugin_interfaces.plugin_apis.audio.AudioQuality
 import kotlinx.serialization.SerialName
@@ -92,18 +95,29 @@ data class UserSettings(
     val lastSupportReminderEpochMs: Long = 0L)
 
 /** The public Group Jam room server. */
-const val DEFAULT_JAM_SERVER_URL = "https://jam.spotube.cc"
+const val DEFAULT_JAM_SERVER_URL = "https://spotube-jam.workers.dev"
 
 /** Whether [url] can be a room server address (http(s), or ws(s) for self-hosters). */
 internal fun isJamServerUrl(url: String): Boolean =
     Regex("^(https?|wss?)://[^\\s/?#]+(/\\S*)?$", RegexOption.IGNORE_CASE).matches(url.trim())
 
-/** opus/webm on every platform: all of their players (ExoPlayer, VLC) can play it. */
-internal fun defaultStreamingMusicFormat(): AudioFormat = AudioFormat(
-    codec = "opus",
-    container = "webm",
-    qualities = listOf(
-        AudioQuality.Lossy(bitrate = 44_000),
-        AudioQuality.Lossy(bitrate = 96_000),
-        AudioQuality.Lossy(bitrate = 128_000),
-        AudioQuality.Lossy(bitrate = 256_000)))
+/**
+ * opus/webm wherever the platform's player can open WebM; iOS (AVPlayer) can't, so it streams AAC.
+ * TODO: revisit once iOS can play Opus (e.g. remuxing to CAF or a non-AVPlayer backend).
+ */
+internal fun defaultStreamingMusicFormat(platform: PlatformType = currentPlatform): AudioFormat {
+    val aac = !isContainerPlayableOn("webm", platform)
+    return AudioFormat(
+        codec = if (aac) "aac" else "opus",
+        container = if (aac) "mp4" else "webm",
+        qualities = listOf(
+            AudioQuality.Lossy(bitrate = 44_000),
+            AudioQuality.Lossy(bitrate = 96_000),
+            AudioQuality.Lossy(bitrate = 128_000),
+            AudioQuality.Lossy(bitrate = 256_000)))
+}
+
+/** Moves settings saved with a streaming format [platform] can't play (iOS' old opus/webm default) to the default. */
+internal fun UserSettings.withPlayableStreamingFormat(platform: PlatformType = currentPlatform): UserSettings =
+    if (isContainerPlayableOn(streamingMusicFormat.container, platform)) this
+    else copy(streamingMusicFormat = defaultStreamingMusicFormat(platform))

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/settings/SettingsRepository.kt

@@ -59,7 +59,7 @@ class SettingsRepository(private val database: Database) : UserSettingsStore {
     override val userSettings: StateFlow<UserSettings> = database.settingsDataStore.data.map { prefs ->
         val json = prefs[SETTINGS_KEY]
         if (json != null) {
-            settingsJson.decodeFromString<UserSettings>(json as String)
+            settingsJson.decodeFromString<UserSettings>(json as String).withPlayableStreamingFormat()
         } else {
             UserSettings() // Default value
         }
@@ -78,6 +78,6 @@ class SettingsRepository(private val database: Database) : UserSettingsStore {
     suspend fun getCurrentSettings(): UserSettings {
         val preferences = database.settingsDataStore.data.first()
         val storedJson = preferences[SETTINGS_KEY] ?: return UserSettings()
-        return settingsJson.decodeFromString<UserSettings>(storedJson)
+        return settingsJson.decodeFromString<UserSettings>(storedJson).withPlayableStreamingFormat()
     }
 }

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/settings/sections/utils.kt

@@ -18,6 +18,8 @@
 package org.spotube.spotube.modules.settings.sections
 
 
+import org.spotube.spotube.core.server.isContainerPlayableOn
+import org.spotube.spotube.core.server.currentPlatform
 import org.spotube.millennium.composables.MillenniumIcon
 import org.spotube.millennium.composables.MillenniumSeparator
 import org.spotube.millennium.theme.MillenniumTheme
@@ -56,6 +58,7 @@ private val standardLossyQualities = listOf(
     AudioQuality.Lossy(bitrate = 128_000),
     AudioQuality.Lossy(bitrate = 256_000))
 
+// Formats the platform's player can't open aren't offered (iOS: no WebM/Ogg).
 internal val streamingFormatPresets = listOf(
     AudioFormat(
         codec = "opus",
@@ -69,7 +72,7 @@ internal val streamingFormatPresets = listOf(
         codec = "vorbis",
         container = "ogg",
         qualities = standardLossyQualities)
-)
+).filter { isContainerPlayableOn(it.container, currentPlatform) }
 
 internal val downloadFormatPresets = listOf(
     AudioFormat(

composeApp/src/commonMain/kotlin/org/spotube/spotube/modules/shell/alternative_track/AlternativeTrackContent.kt

@@ -18,7 +18,6 @@
 package org.spotube.spotube.modules.shell.alternative_track
 
 
-import org.spotube.spotube.core.ui.misc.itemsWithUniqueKeys
 import org.spotube.millennium.composables.MillenniumSpokeSpinner
 import org.spotube.millennium.composables.MillenniumIcon
 import org.spotube.millennium.composables.MillenniumListTile
@@ -120,9 +119,9 @@ fun AlternativeTrackContent(
             LazyColumn(
                 modifier = Modifier.fillMaxSize(),
                 verticalArrangement = Arrangement.spacedBy(6.dp)) {
-                itemsWithUniqueKeys(
+                items(
                     items = uiState.alternatives,
-                    id = { source -> source.id }) { source ->
+                    key = { source -> source.id }) { source ->
                     AlternativeSourceRow(
                         source = source,
                         isActive = source.id == uiState.activeSourceId,

composeApp/src/commonTest/kotlin/org/spotube/spotube/core/audioplayer/DeviceAudioPlayerQueueTest.kt

@@ -8,10 +8,8 @@ import org.spotube.plugin_interfaces.plugin_apis.metadata.artist.MetadataArtist
 import org.spotube.plugin_interfaces.plugin_apis.metadata.common.Thumbnail
 import org.spotube.plugin_interfaces.plugin_apis.metadata.track.MetadataTrack
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.withContext
-import kotlinx.coroutines.withTimeout
 import org.koin.core.context.startKoin
 import org.koin.core.context.stopKoin
 import org.koin.dsl.module
@@ -425,10 +423,7 @@ class DeviceAudioPlayerQueueTest {
         )
 
         val queue = createQueue()
-        // Restore runs on Dispatchers.IO; wait for it on real time rather than assuming one yield is enough.
-        withContext(Dispatchers.Default) {
-            withTimeout(5_000) { while (fakePlayer.loadCallCount == 0) delay(10) }
-        }
+        withContext(Dispatchers.Default) { } // yield to let init coroutine run
 
         assertEquals(1, fakePlayer.loadCallCount)
         assertEquals(QueueCollectionEntry.Playlist("pl-1"), queue.getCurrentCollectionEntry())

composeApp/src/commonTest/kotlin/org/spotube/spotube/core/server/StreamingUrlRepositoryBehaviorTest.kt

@@ -5,6 +5,7 @@ import org.spotube.plugin_interfaces.plugin_apis.audio.AudioSource
 import org.spotube.plugin_interfaces.plugin_apis.audio.AudioStream
 import org.spotube.plugin_interfaces.plugin_apis.audio.StreamProtocol
 import org.spotube.plugin_interfaces.plugin_apis.metadata.track.MetadataTrack
+import org.spotube.spotube.PlatformType
 import org.spotube.spotube.core.audioplayer.QueueEntry
 import org.spotube.spotube.modules.settings.UserSettings
 import co.touchlab.kermit.Logger
@@ -99,7 +100,9 @@ class StreamingUrlRepositoryBehaviorTest {
             audioPlayerQueue = queue,
             matchedTracksRepository = matchedTracksRepository,
             settingsRepository = settings,
-            streamUrlCacheTtlMs = cacheTtlMs)
+            streamUrlCacheTtlMs = cacheTtlMs,
+            // Not the host's platform: Windows and iOS don't prefer opus/webm
+            platform = PlatformType.Linux)
 
         fun selectPlugin(pluginId: String, audioAPI: FakeAudioAPI = FakeAudioAPI()): FakeAudioPluginService {
             val service = FakeAudioPluginService(pluginId, audioAPI)

composeApp/src/commonTest/kotlin/org/spotube/spotube/core/server/StreamingUrlRepositoryTest.kt

@@ -1,5 +1,6 @@
 package org.spotube.spotube.core.server
 
+import org.spotube.spotube.PlatformType
 import org.spotube.plugin_interfaces.plugin_apis.audio.AudioFormat
 import org.spotube.plugin_interfaces.plugin_apis.audio.AudioQuality
 import org.spotube.plugin_interfaces.plugin_apis.audio.AudioStream
@@ -13,6 +14,7 @@ import kotlin.test.assertSame
  * Tests for the stream preference selection used by [StreamingUrlRepository].
  *
  * Ordering contract (best first):
+ * 0. Playable by the platform's player (iOS: no WebM/Ogg containers, no DASH).
  * 1. Fewest codec/container mismatches against the preferred format.
  * 2. Matching quality family (lossy vs lossless).
  * 3. Closest bitrate / sample rate.
@@ -54,7 +56,8 @@ class StreamingUrlRepositoryTest {
     private fun select(
         streams: List<AudioStream>,
         format: AudioFormat = opusWebm(),
-        quality: AudioQuality = AudioQuality.Lossy(256_000)) = selectPreferredAudioStream(streams, format, quality)
+        quality: AudioQuality = AudioQuality.Lossy(256_000),
+        platform: PlatformType = PlatformType.Linux) = selectPreferredAudioStream(streams, format, quality, platform)
 
     // ---------- empty / single ----------
 
@@ -404,20 +407,33 @@ class StreamingUrlRepositoryTest {
         assertEquals("https://www.youtube.com", normalizeManifestUrl("", StreamProtocol.HLS))
     }
 
-    // ---------- no platform restrictions ----------
+    // ---------- device playability ----------
 
     @Test
-    fun `the preferred opus webm stream wins over aac`() {
+    fun `on iOS a playable m4a stream beats the preferred but unplayable opus webm`() {
         val opus = lossy("opus-160", 160_000)
         val aac = lossy("aac-128", 128_000, codec = "mp4a.40.2", container = "m4a")
-        assertSame(opus, select(listOf(aac, opus)))
+        assertSame(aac, select(listOf(opus, aac), platform = PlatformType.IOS))
     }
 
     @Test
-    fun `a dash manifest closest to the preferences is not skipped`() {
-        val dash = lossy("dash", 256_000, protocol = StreamProtocol.DASH)
+    fun `on iOS dash manifests are skipped in favour of progressive streams`() {
+        val dash = lossy("dash", 256_000, codec = "mp4a.40.2", container = "m4a", protocol = StreamProtocol.DASH)
         val progressive = lossy("aac-128", 128_000, codec = "mp4a.40.2", container = "m4a")
-        assertSame(dash, select(listOf(progressive, dash)))
+        assertSame(progressive, select(listOf(dash, progressive), platform = PlatformType.IOS))
+    }
+
+    @Test
+    fun `on iOS an unplayable stream is still returned when nothing else exists`() {
+        val opus = lossy("opus-160", 160_000)
+        assertSame(opus, select(listOf(opus), platform = PlatformType.IOS))
+    }
+
+    @Test
+    fun `off iOS the preferred opus webm stream still wins`() {
+        val opus = lossy("opus-160", 160_000)
+        val aac = lossy("aac-128", 128_000, codec = "mp4a.40.2", container = "m4a")
+        assertSame(opus, select(listOf(opus, aac), platform = PlatformType.Android))
     }
 
 }

composeApp/src/commonTest/kotlin/org/spotube/spotube/modules/settings/StreamingFormatDefaultsTest.kt

@@ -17,19 +17,39 @@
 
 package org.spotube.spotube.modules.settings
 
+import org.spotube.plugin_interfaces.plugin_apis.audio.AudioFormat
+import org.spotube.spotube.PlatformType
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertSame
 
 class StreamingFormatDefaultsTest {
 
+    private val opusWebm = AudioFormat(codec = "opus", container = "webm", qualities = emptyList())
+
     @Test
-    fun `streaming defaults to opus in webm`() {
-        val format = defaultStreamingMusicFormat()
-        assertEquals("opus" to "webm", format.codec to format.container)
+    fun `ios defaults to aac in mp4`() {
+        val format = defaultStreamingMusicFormat(PlatformType.IOS)
+        assertEquals("aac" to "mp4", format.codec to format.container)
     }
 
     @Test
-    fun `user settings default to the streaming default`() {
-        assertEquals(defaultStreamingMusicFormat(), UserSettings().streamingMusicFormat)
+    fun `other platforms keep opus in webm`() {
+        listOf(PlatformType.Android, PlatformType.Linux, PlatformType.MacOS, PlatformType.Windows).forEach { platform ->
+            val format = defaultStreamingMusicFormat(platform)
+            assertEquals("opus" to "webm", format.codec to format.container, platform.name)
+        }
+    }
+
+    @Test
+    fun `saved opus webm is moved to aac on ios`() {
+        val migrated = UserSettings(streamingMusicFormat = opusWebm).withPlayableStreamingFormat(PlatformType.IOS)
+        assertEquals("mp4", migrated.streamingMusicFormat.container)
+    }
+
+    @Test
+    fun `saved opus webm is kept off ios`() {
+        val settings = UserSettings(streamingMusicFormat = opusWebm)
+        assertSame(settings, settings.withPlayableStreamingFormat(PlatformType.Linux))
     }
 }

composeApp/src/iosMain/kotlin/org/spotube/spotube/core/audioplayer/AudioPlayer.ios.kt

@@ -15,12 +15,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+@file:OptIn(ExperimentalForeignApi::class)
+
 package org.spotube.spotube.core.audioplayer
 
+import kotlinx.cinterop.CValue
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -28,39 +32,41 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
+import platform.AVFoundation.AVPlayer
+import platform.AVFoundation.AVPlayerItem
+import platform.AVFoundation.AVPlayerTimeControlStatus
+import platform.AVFoundation.AVPlayerTimeControlStatusPaused
+import platform.AVFoundation.AVPlayerTimeControlStatusPlaying
+import platform.AVFoundation.AVPlayerTimeControlStatusWaitingToPlayAtSpecifiedRate
+import platform.AVFoundation.addPeriodicTimeObserverForInterval
+import platform.AVFoundation.currentItem
+import platform.AVFoundation.duration
+import platform.AVFoundation.loadedTimeRanges
+import platform.AVFoundation.pause
+import platform.AVFoundation.play
+import platform.AVFoundation.rate
+import platform.AVFoundation.replaceCurrentItemWithPlayerItem
+import platform.AVFoundation.seekToTime
+import platform.AVFoundation.timeControlStatus
+import platform.AVFoundation.volume
+import platform.CoreMedia.CMTime
+import platform.CoreMedia.CMTimeGetSeconds
+import platform.Foundation.NSURL
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
-/**
- * iOS player. Playback is done by MobileVLCKit through [NativePlayerEngine]; AVPlayer misreports the
- * duration of some fragmented MP4 streams (doubling it, which leaves the second half silent).
- * The engine plays a single URL, so the playlist, loop, shuffle and auto-advance live here.
- */
 @Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 actual class AudioPlayer actual constructor(context: Any) : AudioPlayerInterface {
 
     actual val context: Any = context
 
-    private val engine: NativePlayerEngine = checkNotNull(NativePlayerRegistry.factory) {
-        "NativePlayerRegistry.factory must be set from Swift before the first AudioPlayer is created"
-    }.create()
+    private val avPlayer: AVPlayer = AVPlayer()
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
-    private val lock = Mutex()
-    private val mediaSession = IosMediaSession()
 
     private var disposed = false
 
-    private val originalPlaylist = mutableListOf<MediaItem>()
     private val currentPlaylist = mutableListOf<MediaItem>()
-    private var currentIndex = -1
-    private var shuffleEnabled = false
-
-    // The engine holds media only after the first play(); until then a requested start position
-    // is kept here and handed over with the media.
-    private var engineHasMedia = false
-    private var pendingStartMs = 0L
+    private val urlIndexMap = mutableMapOf<String, Int>()
 
     private val _playerState = MutableStateFlow(PlayerState.IDLE)
     private val _currentMediaItem = MutableStateFlow<MediaItem?>(null)
@@ -88,182 +94,97 @@ actual class AudioPlayer actual constructor(context: Any) : AudioPlayerInterface
     actual override val completionFlow: Flow<Unit> = _completion.asSharedFlow()
     actual override val errorFlow: Flow<Throwable> = _error.asSharedFlow()
 
-    private val engineListener = object : NativePlayerListener {
-        override fun onState(state: NativePlayerState) {
-            if (disposed) return
-            when (state) {
-                NativePlayerState.IDLE -> _playerState.tryEmit(PlayerState.IDLE)
-                NativePlayerState.OPENING,
-                NativePlayerState.BUFFERING -> _playerState.tryEmit(PlayerState.BUFFERING)
-                NativePlayerState.PLAYING -> {
-                    _playerState.tryEmit(PlayerState.PLAYING)
-                    mediaSession.update(
-                        _currentMediaItem.value,
-                        _position.value.inWholeMilliseconds / 1000.0,
-                        _duration.value.inWholeMilliseconds / 1000.0,
-                        true)
-                }
-                NativePlayerState.PAUSED -> {
-                    _playerState.tryEmit(PlayerState.PAUSED)
-                    mediaSession.update(
-                        _currentMediaItem.value,
-                        _position.value.inWholeMilliseconds / 1000.0,
-                        _duration.value.inWholeMilliseconds / 1000.0,
-                        false)
-                }
-                NativePlayerState.ENDED -> scope.launch { lock.withLock { onMediaEndedLocked() } }
-            }
-        }
-
-        override fun onTime(positionMs: Long) {
-            if (disposed || positionMs < 0) return
-            _position.tryEmit(positionMs.milliseconds)
-            mediaSession.update(
-                _currentMediaItem.value,
-                positionMs / 1000.0,
-                _duration.value.inWholeMilliseconds / 1000.0,
-                _playerState.value == PlayerState.PLAYING)
-        }
-
-        override fun onDuration(durationMs: Long) {
-            if (disposed || durationMs <= 0) return
-            _duration.tryEmit(durationMs.milliseconds)
-        }
-
-        override fun onError(message: String) {
-            if (disposed) return
-            _playerState.tryEmit(PlayerState.IDLE)
-            _error.tryEmit(IllegalStateException("VLC playback error: $message"))
-        }
-    }
+    private var lastTimeControlStatus: AVPlayerTimeControlStatus? = null
 
     init {
-        engine.setListener(engineListener)
-        mediaSession.configure(
-            onPlay = { scope.launch { play() } },
-            onPause = { scope.launch { pause() } },
-            onSeek = { seconds -> scope.launch { seekTo(seconds.milliseconds) } },
-            onNext = { scope.launch { skipToNext() } },
-            onPrevious = { scope.launch { skipToPrevious() } })
-    }
+        avPlayer.addPeriodicTimeObserverForInterval(
+            interval = CMTimeMake(1, 4),
+            queue = null
+        ) { time ->
+            if (!disposed) {
+                val seconds = CMTimeGetSeconds(time)
+                _position.tryEmit(seconds.seconds)
 
-    /** Loads [currentPlaylist] at [currentIndex] into the engine. Caller holds [lock]. */
-    private fun loadCurrentIntoEngineLocked(autoPlay: Boolean) {
-        val item = currentPlaylist.getOrNull(currentIndex) ?: return
-        val startMs = pendingStartMs
-        pendingStartMs = 0L
-        engineHasMedia = true
-        _position.tryEmit(startMs.milliseconds)
-        _bufferingPosition.tryEmit(Duration.ZERO)
-        _duration.tryEmit(item.duration)
-        engine.load(item.url, autoPlay, startMs)
-    }
-
-    /** Switches to [index] and starts it. Caller holds [lock]. */
-    private fun playIndexLocked(index: Int) {
-        currentIndex = index
-        _currentMediaItem.tryEmit(currentPlaylist[index])
-        pendingStartMs = 0L
-        loadCurrentIntoEngineLocked(autoPlay = true)
-    }
-
-    private fun onMediaEndedLocked() {
-        if (disposed || currentPlaylist.isEmpty()) return
-        _completion.tryEmit(Unit)
-        when {
-            _loopState.value == LoopState.ONE -> playIndexLocked(currentIndex.coerceAtLeast(0))
-            currentIndex < currentPlaylist.lastIndex -> playIndexLocked(currentIndex + 1)
-            _loopState.value == LoopState.ALL -> playIndexLocked(0)
-            else -> {
-                _playerState.tryEmit(PlayerState.COMPLETED)
-                engineHasMedia = false
+                avPlayer.currentItem?.let { item ->
+                    val durationSeconds = CMTimeGetSeconds(item.duration)
+                    if (durationSeconds > 0) {
+                        _duration.tryEmit(durationSeconds.seconds)
+                    }
+                    val loadedRanges = item.loadedTimeRanges
+//                    if (loadedRanges.count() > 0u) {
+//                        val range = loadedRanges.objectAtIndex(0u)
+//                    }
+                }
             }
         }
+
+        scope.launch {
+            while (!disposed) {
+                syncTimeControlStatus()
+                delay(500)
+            }
+        }
+    }
+
+    private fun syncTimeControlStatus() {
+        val status = avPlayer.timeControlStatus
+        if (status == lastTimeControlStatus) return
+        lastTimeControlStatus = status
+
+        val playerState = when (status) {
+            AVPlayerTimeControlStatusPlaying -> PlayerState.PLAYING
+            AVPlayerTimeControlStatusPaused -> PlayerState.PAUSED
+            AVPlayerTimeControlStatusWaitingToPlayAtSpecifiedRate -> PlayerState.BUFFERING
+            else -> PlayerState.IDLE
+        }
+        _playerState.tryEmit(playerState)
+
+        if (avPlayer.currentItem == null) {
+            _playerState.tryEmit(PlayerState.IDLE)
+        }
+    }
+
+    private fun resolveState(): PlayerState {
+        return when (avPlayer.timeControlStatus) {
+            AVPlayerTimeControlStatusPlaying -> PlayerState.PLAYING
+            AVPlayerTimeControlStatusPaused -> PlayerState.PAUSED
+            AVPlayerTimeControlStatusWaitingToPlayAtSpecifiedRate -> PlayerState.BUFFERING
+            else -> PlayerState.IDLE
+        }
+    }
+
+    private fun buildAVPlayerItem(url: String): AVPlayerItem? {
+        val nsUrl = NSURL.URLWithString(url) ?: return null
+        return AVPlayerItem(nsUrl)
     }
 
     actual override suspend fun play() {
-        lock.withLock {
-            if (disposed || currentPlaylist.isEmpty()) return
-            mediaSession.activate()
-            if (currentIndex !in currentPlaylist.indices) {
-                currentIndex = 0
-                _currentMediaItem.tryEmit(currentPlaylist[0])
-            }
-            if (engineHasMedia) engine.play() else loadCurrentIntoEngineLocked(autoPlay = true)
-        }
+        avPlayer.play()
     }
 
     actual override suspend fun pause() {
-        lock.withLock {
-            if (disposed) return
-            engine.pause()
-        }
+        avPlayer.pause()
     }
 
     actual override suspend fun stop() {
-        lock.withLock {
-            if (disposed) return
-            engine.stop()
-            mediaSession.deactivate()
-            mediaSession.update(
-                _currentMediaItem.value,
-                0.0,
-                _duration.value.inWholeMilliseconds / 1000.0,
-                false)
-            engineHasMedia = false
-            pendingStartMs = 0L
-            _position.tryEmit(Duration.ZERO)
-            _playerState.tryEmit(PlayerState.IDLE)
-        }
+        avPlayer.pause()
+        avPlayer.seekToTime(CMTimeMake(0, 1))
+        _playerState.tryEmit(PlayerState.IDLE)
     }
 
     actual override suspend fun seekTo(position: Duration) {
-        lock.withLock {
-            if (disposed) return
-            val maxMs = _duration.value.inWholeMilliseconds
-            val targetMs = if (maxMs > 0) {
-                position.inWholeMilliseconds.coerceIn(0, maxMs)
-            } else {
-                position.inWholeMilliseconds.coerceAtLeast(0)
-            }
-            if (engineHasMedia) engine.seekTo(targetMs) else pendingStartMs = targetMs
-            _position.tryEmit(targetMs.milliseconds)
-        }
+        val seconds = position.inWholeMilliseconds / 1000.0
+        val cmTime = CMTimeMakeWithSeconds(seconds, 1000)
+        avPlayer.seekToTime(cmTime)
+        _position.tryEmit(position)
     }
 
     actual override suspend fun loop(state: LoopState) {
-        lock.withLock {
-            if (disposed) return
-            _loopState.tryEmit(state)
-        }
+        _loopState.tryEmit(state)
     }
 
     actual override suspend fun shuffle(enabled: Boolean) {
-        lock.withLock {
-            if (disposed || currentPlaylist.isEmpty() || shuffleEnabled == enabled) return
-
-            val currentItem = _currentMediaItem.value
-            val rebuilt = if (enabled) {
-                if (currentItem != null) {
-                    listOf(currentItem) + originalPlaylist.filterNot { it.url == currentItem.url }.shuffled()
-                } else {
-                    originalPlaylist.shuffled()
-                }
-            } else {
-                originalPlaylist.toList()
-            }
-
-            currentPlaylist.clear()
-            currentPlaylist.addAll(rebuilt)
-            shuffleEnabled = enabled
-            _shuffleMode.tryEmit(enabled)
-            _playlist.tryEmit(currentPlaylist.toList())
-
-            currentIndex = if (currentItem == null) 0 else {
-                currentPlaylist.indexOfFirst { it.url == currentItem.url }.takeIf { it >= 0 } ?: 0
-            }
-            _currentMediaItem.tryEmit(currentPlaylist.getOrNull(currentIndex))
-        }
+        _shuffleMode.tryEmit(enabled)
     }
 
     actual override suspend fun load(
@@ -271,186 +192,143 @@ actual class AudioPlayer actual constructor(context: Any) : AudioPlayerInterface
         autoPlay: Boolean,
         startPosition: Int
     ) {
-        lock.withLock {
-            if (disposed) return
+        currentPlaylist.clear()
+        currentPlaylist.addAll(playlist)
+        urlIndexMap.clear()
+        playlist.forEachIndexed { index, item ->
+            urlIndexMap[item.url] = index
+        }
+        _playlist.tryEmit(currentPlaylist.toList())
 
-            originalPlaylist.clear()
-            originalPlaylist.addAll(playlist)
-            currentPlaylist.clear()
-            currentPlaylist.addAll(playlist)
-            shuffleEnabled = false
-            _shuffleMode.tryEmit(false)
-            _playlist.tryEmit(currentPlaylist.toList())
-
-            engine.stop()
-            engineHasMedia = false
-            pendingStartMs = 0L
+        if (playlist.isEmpty()) {
+            _playerState.tryEmit(PlayerState.IDLE)
+            _currentMediaItem.tryEmit(null)
             _position.tryEmit(Duration.ZERO)
-            _bufferingPosition.tryEmit(Duration.ZERO)
+            _duration.tryEmit(Duration.ZERO)
+            return
+        }
 
-            if (currentPlaylist.isEmpty()) {
-                currentIndex = -1
-                _currentMediaItem.tryEmit(null)
-                _playerState.tryEmit(PlayerState.IDLE)
-                _duration.tryEmit(Duration.ZERO)
-                return
-            }
+        val safeIndex = startPosition.coerceIn(0, playlist.lastIndex)
+        val item = playlist[safeIndex]
+        val avItem = buildAVPlayerItem(item.url)
 
-            currentIndex = startPosition.coerceIn(0, currentPlaylist.lastIndex)
-            _currentMediaItem.tryEmit(currentPlaylist[currentIndex])
-            _duration.tryEmit(currentPlaylist[currentIndex].duration)
-            mediaSession.update(
-                _currentMediaItem.value,
-                0.0,
-                _duration.value.inWholeMilliseconds / 1000.0,
-                false)
+        if (avItem == null) {
+            _error.tryEmit(IllegalArgumentException("Invalid URL: ${item.url}"))
+            _playerState.tryEmit(PlayerState.IDLE)
+            return
+        }
 
-            if (autoPlay) {
-                loadCurrentIntoEngineLocked(autoPlay = true)
-            } else {
-                _playerState.tryEmit(PlayerState.PAUSED)
-            }
+        avPlayer.replaceCurrentItemWithPlayerItem(avItem)
+        _currentMediaItem.tryEmit(item)
+
+        if (autoPlay) {
+            avPlayer.play()
         }
     }
 
     actual override suspend fun addMediaItem(mediaItem: MediaItem) {
-        lock.withLock {
-            if (disposed) return
-            originalPlaylist.add(mediaItem)
-            currentPlaylist.add(mediaItem)
-            _playlist.tryEmit(currentPlaylist.toList())
-            if (currentIndex == -1) {
-                currentIndex = 0
-                _currentMediaItem.tryEmit(currentPlaylist.firstOrNull())
-            }
-        }
+        currentPlaylist.add(mediaItem)
+        urlIndexMap[mediaItem.url] = currentPlaylist.lastIndex
+        _playlist.tryEmit(currentPlaylist.toList())
     }
 
     actual override suspend fun insertMediaItemAtNextIndex(mediaItem: MediaItem) {
-        lock.withLock {
-            if (disposed) return
-            val insertIndex = if (currentIndex >= 0) currentIndex + 1 else 0
-            originalPlaylist.add(insertIndex.coerceAtMost(originalPlaylist.size), mediaItem)
-            currentPlaylist.add(insertIndex, mediaItem)
-            _playlist.tryEmit(currentPlaylist.toList())
-            if (currentIndex == -1) {
-                currentIndex = 0
-                _currentMediaItem.tryEmit(currentPlaylist.firstOrNull())
-            }
+        val currentIndex = currentPlaylist.indexOfFirst {
+            it.url == _currentMediaItem.value?.url
         }
+        val insertIndex = if (currentIndex >= 0) currentIndex + 1 else currentPlaylist.size
+        currentPlaylist.add(insertIndex, mediaItem)
+        urlIndexMap.clear()
+        currentPlaylist.forEachIndexed { index, item ->
+            urlIndexMap[item.url] = index
+        }
+        _playlist.tryEmit(currentPlaylist.toList())
     }
 
     actual override suspend fun removeMediaItem(mediaItem: MediaItem) {
-        lock.withLock {
-            if (disposed || currentPlaylist.isEmpty()) return
-
-            originalPlaylist.removeAll { it.url == mediaItem.url }
-            val currentUrl = _currentMediaItem.value?.url
-            val removedCurrent = currentUrl == mediaItem.url
-            val removalIndices = currentPlaylist.withIndex()
-                .filter { it.value.url == mediaItem.url }
-                .map { it.index }
-            if (removalIndices.isEmpty()) return
-
-            // Items before the playing one shift it down, so keep the index on the same item.
-            val removedBefore = removalIndices.count { it < currentIndex }
-            removalIndices.asReversed().forEach { currentPlaylist.removeAt(it) }
-
-            if (currentPlaylist.isEmpty()) {
-                currentIndex = -1
-                _currentMediaItem.tryEmit(null)
-                engine.stop()
-                engineHasMedia = false
-                _playerState.tryEmit(PlayerState.IDLE)
-            } else if (removedCurrent) {
-                currentIndex = currentIndex.coerceIn(0, currentPlaylist.lastIndex)
-                _currentMediaItem.tryEmit(currentPlaylist[currentIndex])
-                engine.stop()
-                engineHasMedia = false
-            } else {
-                currentIndex = (currentIndex - removedBefore).coerceIn(0, currentPlaylist.lastIndex)
-            }
-
-            _playlist.tryEmit(currentPlaylist.toList())
+        val index = urlIndexMap[mediaItem.url] ?: return
+        currentPlaylist.removeAt(index)
+        urlIndexMap.clear()
+        currentPlaylist.forEachIndexed { i, item ->
+            urlIndexMap[item.url] = i
         }
+        _playlist.tryEmit(currentPlaylist.toList())
     }
 
     actual override suspend fun moveMediaItem(fromIndex: Int, toIndex: Int) {
-        lock.withLock {
-            if (disposed) return
-            if (fromIndex !in currentPlaylist.indices || toIndex !in currentPlaylist.indices || fromIndex == toIndex) return
-
-            val item = currentPlaylist.removeAt(fromIndex)
-            currentPlaylist.add(toIndex, item)
-
-            if (!shuffleEnabled && fromIndex in originalPlaylist.indices && toIndex in originalPlaylist.indices) {
-                originalPlaylist.add(toIndex, originalPlaylist.removeAt(fromIndex))
-            }
-
-            val currentUrl = _currentMediaItem.value?.url
-            currentIndex = currentUrl?.let { url ->
-                currentPlaylist.indexOfFirst { it.url == url }.takeIf { it >= 0 }
-            } ?: currentIndex.coerceIn(0, currentPlaylist.lastIndex)
-
-            _playlist.tryEmit(currentPlaylist.toList())
-            _currentMediaItem.tryEmit(currentPlaylist.getOrNull(currentIndex))
+        if (fromIndex !in currentPlaylist.indices || toIndex !in currentPlaylist.indices || fromIndex == toIndex) return
+        val item = currentPlaylist.removeAt(fromIndex)
+        currentPlaylist.add(toIndex, item)
+        urlIndexMap.clear()
+        currentPlaylist.forEachIndexed { i, it ->
+            urlIndexMap[it.url] = i
         }
+        _playlist.tryEmit(currentPlaylist.toList())
     }
 
     actual override suspend fun skipToNext() {
-        lock.withLock {
-            if (disposed || currentPlaylist.isEmpty()) return
-            playIndexLocked((currentIndex + 1).coerceAtMost(currentPlaylist.lastIndex))
+        val currentIndex = currentPlaylist.indexOfFirst {
+            it.url == _currentMediaItem.value?.url
+        }
+        val nextIndex = currentIndex + 1
+        if (nextIndex < currentPlaylist.size) {
+            val nextItem = currentPlaylist[nextIndex]
+            val avItem = buildAVPlayerItem(nextItem.url)
+            if (avItem != null) {
+                avPlayer.replaceCurrentItemWithPlayerItem(avItem)
+                _currentMediaItem.tryEmit(nextItem)
+                avPlayer.play()
+            }
         }
     }
 
     actual override suspend fun skipToPrevious() {
-        lock.withLock {
-            if (disposed || currentPlaylist.isEmpty()) return
-            playIndexLocked((currentIndex - 1).coerceAtLeast(0))
+        val currentIndex = currentPlaylist.indexOfFirst {
+            it.url == _currentMediaItem.value?.url
+        }
+        val prevIndex = currentIndex - 1
+        if (prevIndex >= 0) {
+            val prevItem = currentPlaylist[prevIndex]
+            val avItem = buildAVPlayerItem(prevItem.url)
+            if (avItem != null) {
+                avPlayer.replaceCurrentItemWithPlayerItem(avItem)
+                _currentMediaItem.tryEmit(prevItem)
+                avPlayer.play()
+            }
         }
     }
 
     actual override suspend fun jumpTo(index: Int) {
-        lock.withLock {
-            if (disposed || index !in currentPlaylist.indices) return
-            playIndexLocked(index)
+        if (index in currentPlaylist.indices) {
+            val item = currentPlaylist[index]
+            val avItem = buildAVPlayerItem(item.url)
+            if (avItem != null) {
+                avPlayer.replaceCurrentItemWithPlayerItem(avItem)
+                _currentMediaItem.tryEmit(item)
+            }
         }
     }
 
     actual override suspend fun setVolume(volume: Float) {
-        lock.withLock {
-            if (disposed) return
-            val clamped = volume.coerceIn(0f, 1f)
-            engine.setVolume(clamped)
-            _volume.tryEmit(clamped)
-        }
+        val clamped = volume.coerceIn(0f, 1f)
+        avPlayer.volume = clamped
+        _volume.tryEmit(clamped)
     }
 
     actual override suspend fun setPlaybackSpeed(speed: Float) {
-        lock.withLock {
-            if (disposed) return
-            val clamped = speed.coerceIn(0.25f, 4f)
-            engine.setRate(clamped)
-            _playbackSpeed.tryEmit(clamped)
-        }
+        val clamped = speed.coerceIn(0.25f, 4f)
+        avPlayer.rate = clamped
+        _playbackSpeed.tryEmit(clamped)
     }
 
     actual override fun isDisposed(): Boolean = disposed
 
     actual override fun dispose() {
-        if (disposed) return
         disposed = true
-        engine.setListener(null)
-        engine.destroy()
-        mediaSession.deactivate()
-        mediaSession.clear()
-        scope.cancel()
-
-        originalPlaylist.clear()
+        avPlayer.pause()
+        avPlayer.replaceCurrentItemWithPlayerItem(null)
         currentPlaylist.clear()
-        currentIndex = -1
-        engineHasMedia = false
+        urlIndexMap.clear()
 
         _playerState.tryEmit(PlayerState.IDLE)
         _currentMediaItem.tryEmit(null)
@@ -460,3 +338,11 @@ actual class AudioPlayer actual constructor(context: Any) : AudioPlayerInterface
         _bufferingPosition.tryEmit(Duration.ZERO)
     }
 }
+
+private fun CMTimeMake(value: Long, timescale: Int): CValue<CMTime> {
+    return platform.CoreMedia.CMTimeMake(value, timescale)
+}
+
+private fun CMTimeMakeWithSeconds(seconds: Double, preferredTimescale: Int): CValue<CMTime> {
+    return platform.CoreMedia.CMTimeMakeWithSeconds(seconds, preferredTimescale)
+}

composeApp/src/iosMain/kotlin/org/spotube/spotube/core/audioplayer/IosMediaSession.kt

@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2026 Kingkor Roy Tirtho and Spotube Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-@file:OptIn(ExperimentalForeignApi::class)
-
-package org.spotube.spotube.core.audioplayer
-
-import kotlinx.cinterop.ExperimentalForeignApi
-import platform.AVFAudio.AVAudioSession
-import platform.AVFAudio.AVAudioSessionCategoryPlayback
-import platform.AVFAudio.AVAudioSessionModeDefault
-import platform.AVFAudio.setActive
-import platform.Foundation.NSNotificationCenter
-import platform.Foundation.NSNumber
-import platform.Foundation.NSOperationQueue
-import platform.MediaPlayer.MPChangePlaybackPositionCommandEvent
-import platform.MediaPlayer.MPMediaItemPropertyAlbumTitle
-import platform.MediaPlayer.MPMediaItemPropertyArtist
-import platform.MediaPlayer.MPMediaItemPropertyPlaybackDuration
-import platform.MediaPlayer.MPMediaItemPropertyTitle
-import platform.MediaPlayer.MPNowPlayingInfoCenter
-import platform.MediaPlayer.MPNowPlayingInfoPropertyElapsedPlaybackTime
-import platform.MediaPlayer.MPNowPlayingInfoPropertyPlaybackRate
-import platform.MediaPlayer.MPRemoteCommand
-import platform.MediaPlayer.MPRemoteCommandCenter
-import platform.MediaPlayer.MPRemoteCommandHandlerStatusCommandFailed
-import platform.MediaPlayer.MPRemoteCommandHandlerStatusSuccess
-
-internal class IosMediaSession {
-    private val audioSession = AVAudioSession.sharedInstance()
-    private val nowPlayingInfoCenter = MPNowPlayingInfoCenter.defaultCenter()
-    private val remoteCommandCenter = MPRemoteCommandCenter.sharedCommandCenter()
-
-    private var configured = false
-    private val notificationCenter = NSNotificationCenter.defaultCenter()
-    private val notificationTokens = mutableListOf<Any>()
-    private val remoteCommandTokens = mutableListOf<Pair<MPRemoteCommand, Any>>()
-    private var onPlay: (() -> Unit)? = null
-    private var onPause: (() -> Unit)? = null
-    private var onSeek: ((Double) -> Unit)? = null
-    private var onNext: (() -> Unit)? = null
-    private var onPrevious: (() -> Unit)? = null
-
-    fun configure(
-        onPlay: () -> Unit,
-        onPause: () -> Unit,
-        onSeek: (Double) -> Unit,
-        onNext: () -> Unit,
-        onPrevious: () -> Unit
-    ) {
-        this.onPlay = onPlay
-        this.onPause = onPause
-        this.onSeek = onSeek
-        this.onNext = onNext
-        this.onPrevious = onPrevious
-
-        if (configured) return
-        configured = true
-
-        audioSession.setCategory(
-            category = AVAudioSessionCategoryPlayback,
-            mode = AVAudioSessionModeDefault,
-            options = 0u,
-            error = null)
-        registerAudioSessionNotifications()
-        registerRemoteCommands()
-    }
-
-    fun activate() {
-        audioSession.setActive(true, error = null)
-    }
-
-    fun deactivate() {
-        audioSession.setActive(false, error = null)
-    }
-
-    fun update(
-        item: MediaItem?,
-        positionSeconds: Double,
-        durationSeconds: Double,
-        isPlaying: Boolean
-    ) {
-        if (item == null) {
-            nowPlayingInfoCenter.nowPlayingInfo = null
-            return
-        }
-
-        val info = buildMap<Any?, Any?> {
-            put(MPMediaItemPropertyTitle, item.title)
-            put(MPMediaItemPropertyArtist, item.artist)
-            item.album.takeIf { it.isNotBlank() }?.let {
-                put(MPMediaItemPropertyAlbumTitle, it)
-            }
-            if (durationSeconds.isFinite() && durationSeconds > 0) {
-                put(MPMediaItemPropertyPlaybackDuration, durationSeconds)
-            }
-            if (positionSeconds.isFinite() && positionSeconds >= 0) {
-                put(MPNowPlayingInfoPropertyElapsedPlaybackTime, positionSeconds)
-            }
-            put(MPNowPlayingInfoPropertyPlaybackRate, if (isPlaying) 1.0 else 0.0)
-        }
-        nowPlayingInfoCenter.nowPlayingInfo = info
-    }
-
-    fun clear() {
-        nowPlayingInfoCenter.nowPlayingInfo = null
-        notificationTokens.forEach { notificationCenter.removeObserver(it) }
-        notificationTokens.clear()
-        remoteCommandTokens.forEach { (command, token) -> command.removeTarget(token) }
-        remoteCommandTokens.clear()
-        configured = false
-        onPlay = null
-        onPause = null
-        onSeek = null
-        onNext = null
-        onPrevious = null
-    }
-
-    private fun registerAudioSessionNotifications() {
-        notificationCenter.addObserverForName(
-            name = platform.AVFAudio.AVAudioSessionInterruptionNotification,
-            `object` = audioSession,
-            queue = NSOperationQueue.mainQueue()) { notification ->
-            val type = notification?.userInfo?.get(
-                platform.AVFAudio.AVAudioSessionInterruptionTypeKey) as? NSNumber
-            if (type?.unsignedLongValue == platform.AVFAudio.AVAudioSessionInterruptionTypeBegan) {
-                onPause?.invoke()
-            } else if (type?.unsignedLongValue == platform.AVFAudio.AVAudioSessionInterruptionTypeEnded) {
-                activate()
-                val options = notification?.userInfo?.get(
-                    platform.AVFAudio.AVAudioSessionInterruptionOptionKey) as? NSNumber
-                val shouldResume = options?.unsignedLongValue
-                    ?.and(platform.AVFAudio.AVAudioSessionInterruptionOptionShouldResume)
-                    ?.let { it != 0UL } == true
-                if (shouldResume) onPlay?.invoke()
-            }
-        }?.let { notificationTokens += it }
-    }
-
-    private fun registerRemoteCommands() {
-        fun register(command: MPRemoteCommand, handler: (platform.MediaPlayer.MPRemoteCommandEvent?) -> platform.MediaPlayer.MPRemoteCommandHandlerStatus) {
-            command.addTargetWithHandler(handler)?.let {
-                remoteCommandTokens += command to it
-            }
-        }
-
-        register(remoteCommandCenter.playCommand) {
-            onPlay?.invoke()
-            MPRemoteCommandHandlerStatusSuccess
-        }
-        register(remoteCommandCenter.pauseCommand) {
-            onPause?.invoke()
-            MPRemoteCommandHandlerStatusSuccess
-        }
-        register(remoteCommandCenter.changePlaybackPositionCommand) { event ->
-            val position = (event as? MPChangePlaybackPositionCommandEvent)?.positionTime
-            if (position != null && position.isFinite() && position >= 0) {
-                onSeek?.invoke(position)
-                MPRemoteCommandHandlerStatusSuccess
-            } else {
-                MPRemoteCommandHandlerStatusCommandFailed
-            }
-        }
-        register(remoteCommandCenter.nextTrackCommand) {
-            onNext?.invoke()
-            MPRemoteCommandHandlerStatusSuccess
-        }
-        register(remoteCommandCenter.previousTrackCommand) {
-            onPrevious?.invoke()
-            MPRemoteCommandHandlerStatusSuccess
-        }
-    }
-}

composeApp/src/iosMain/kotlin/org/spotube/spotube/core/audioplayer/NativePlayerEngine.kt

@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2026 Kingkor Roy Tirtho and Spotube Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.spotube.spotube.core.audioplayer
-
-/**
- * Single-media playback engine implemented in Swift on top of MobileVLCKit
- * (`iosApp/iosApp/VlcPlayerEngine.swift`).
- *
- * MobileVLCKit comes from CocoaPods into the Xcode project, so Gradle can't bind it with cinterop.
- * Swift implements this contract instead and registers it in [NativePlayerRegistry] before the
- * Compose view controller is created. The playlist, loop and shuffle logic stays in Kotlin
- * ([AudioPlayer]); the engine only ever plays one URL at a time.
- *
- * Implementations may be called from any thread and must hop to the thread VLC needs
- * themselves. [NativePlayerListener] callbacks may arrive on any thread.
- */
-interface NativePlayerEngine {
-    fun setListener(listener: NativePlayerListener?)
-
-    /** Replaces the current media. Starts playing right away when [autoPlay] is set. */
-    fun load(url: String, autoPlay: Boolean, startPositionMs: Long)
-    fun play()
-    fun pause()
-    fun stop()
-    fun seekTo(positionMs: Long)
-
-    /** [volume] is 0..1. */
-    fun setVolume(volume: Float)
-    fun setRate(rate: Float)
-
-    /**
-     * Releases the native player. The engine must not be used afterwards. Not named `release`:
-     * that would export to Objective-C as `-release` and clash with NSObject.
-     */
-    fun destroy()
-}
-
-interface NativePlayerListener {
-    fun onState(state: NativePlayerState)
-    fun onTime(positionMs: Long)
-    fun onDuration(durationMs: Long)
-    fun onError(message: String)
-}
-
-enum class NativePlayerState {
-    /** Nothing loaded, or playback was stopped. */
-    IDLE,
-    OPENING,
-    BUFFERING,
-    PLAYING,
-    PAUSED,
-
-    /** The media played to its end. Sent once per loaded media. */
-    ENDED
-}
-
-interface NativePlayerEngineFactory {
-    fun create(): NativePlayerEngine
-}
-
-/** Set from Swift (`iOSApp.init`) before the first [AudioPlayer] is created. */
-object NativePlayerRegistry {
-    var factory: NativePlayerEngineFactory? = null
-}

composeApp/src/jvmMain/kotlin/org/spotube/spotube/modules/library/local_tracks/media/JvmLocalMediaDiscoveryService.kt

@@ -19,13 +19,6 @@ package org.spotube.spotube.modules.library.local_tracks.media
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.jetbrains.skia.EncodedImageFormat
-import org.jetbrains.skia.FilterMipmap
-import org.jetbrains.skia.FilterMode
-import org.jetbrains.skia.Image
-import org.jetbrains.skia.MipmapMode
-import org.jetbrains.skia.Rect
-import org.jetbrains.skia.Surface
 import java.nio.file.FileSystems
 import java.nio.file.Files
 import java.nio.file.Path
@@ -77,7 +70,7 @@ class JvmLocalMediaDiscoveryService : LocalMediaDiscoveryService {
                                 artists = metadata?.artists?.takeIf { it.isNotEmpty() } ?: emptyList(),
                                 durationMs = metadata?.durationMs ?: 0L,
                                 album = metadata?.album,
-                                coverBytes = metadata?.coverBytes?.let(::coverThumbnail))
+                                coverBytes = metadata?.coverBytes)
                             folders.getOrPut(parent) { mutableListOf() }.add(track)
                         }
                 }
@@ -194,30 +187,3 @@ class JvmLocalMediaDiscoveryService : LocalMediaDiscoveryService {
             "wma")
     }
 }
-
-/**
- * Embedded covers can be several MB each and the index is serialised to JSON, so keep a small
- * JPEG like Android does (#3193). Returns null for unreadable art.
- */
-internal fun coverThumbnail(bytes: ByteArray, size: Int = COVER_THUMBNAIL_SIZE): ByteArray? = runCatching {
-    Image.makeFromEncoded(bytes).use { source ->
-        val scale = size.toFloat() / minOf(source.width, source.height)
-        if (scale >= 1f && bytes.size <= MAX_SMALL_COVER_BYTES) return@runCatching bytes
-        val width = (source.width * scale.coerceAtMost(1f)).toInt().coerceAtLeast(1)
-        val height = (source.height * scale.coerceAtMost(1f)).toInt().coerceAtLeast(1)
-        Surface.makeRasterN32Premul(width, height).use { surface ->
-            surface.canvas.drawImageRect(
-                source,
-                Rect.makeWH(source.width.toFloat(), source.height.toFloat()),
-                Rect.makeWH(width.toFloat(), height.toFloat()),
-                FilterMipmap(FilterMode.LINEAR, MipmapMode.NONE),
-                null,
-                true)
-            surface.makeImageSnapshot().use { it.encodeToData(EncodedImageFormat.JPEG, 85)?.bytes }
-        }
-    }
-}.getOrNull()
-
-private const val COVER_THUMBNAIL_SIZE = 160
-private const val MAX_SMALL_COVER_BYTES = 64 * 1024
-

composeApp/src/jvmTest/kotlin/org/spotube/spotube/core/server/StreamFileRangeTest.kt

@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2026 Kingkor Roy Tirtho and Spotube Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.spotube.spotube.core.server
-
-import io.ktor.utils.io.ByteChannel
-import io.ktor.utils.io.readRemaining
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.io.readByteArray
-import okio.FileSystem
-import okio.Path.Companion.toOkioPath
-import java.nio.file.Files
-import kotlin.random.Random
-import kotlin.test.Test
-import kotlin.test.assertContentEquals
-
-class StreamFileRangeTest {
-    // Several chunks plus a partial one.
-    private val data = Random(42).nextBytes(64 * 1024 * 3 + 1234)
-
-    private fun copy(start: Long, length: Long): ByteArray = runBlocking {
-        val file = Files.createTempFile("spotube-cache", ".bin").also { it.toFile().deleteOnExit() }
-        Files.write(file, data)
-        val channel = ByteChannel()
-        launch {
-            streamFileRange(FileSystem.SYSTEM, file.toOkioPath(), start, length, channel)
-            channel.flushAndClose()
-        }
-        channel.readRemaining().readByteArray()
-    }
-
-    @Test
-    fun wholeFile() = assertContentEquals(data, copy(0, data.size.toLong()))
-
-    @Test
-    fun rangeAcrossChunks() {
-        val start = 70_000L
-        val length = 120_000L
-        assertContentEquals(data.copyOfRange(start.toInt(), (start + length).toInt()), copy(start, length))
-    }
-
-    @Test
-    fun lengthPastEndStopsAtEof() = assertContentEquals(data.copyOfRange(100, data.size), copy(100, data.size.toLong()))
-}

composeApp/src/jvmTest/kotlin/org/spotube/spotube/core/ui/component/TrackListVirtualizationTest.kt

@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2026 Kingkor Roy Tirtho and Spotube Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.spotube.spotube.core.ui.component
-
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.ImageComposeScene
-import androidx.compose.ui.semantics.SemanticsNode
-import androidx.compose.ui.semantics.SemanticsProperties
-import androidx.compose.ui.semantics.getOrNull
-import androidx.compose.ui.use
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import org.spotube.plugin_interfaces.plugin_apis.metadata.artist.MetadataArtist
-import org.spotube.plugin_interfaces.plugin_apis.metadata.track.MetadataTrack
-import org.spotube.spotube.core.ui.theming.SpotubeTheme
-import org.spotube.spotube.modules.settings.Theme
-import org.spotube.spotube.modules.settings.UserSettings
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-/** #3200: big track lists must only compose the rows on screen. */
-@OptIn(ExperimentalComposeUiApi::class)
-class TrackListVirtualizationTest {
-    private fun track(index: Int) = MetadataTrack(
-        // Every 100th id repeats: playlists can hold the same track twice.
-        id = if (index % 100 == 0) "dup" else "t$index",
-        title = "Song $index",
-        durationMs = 200_000L,
-        trackNumber = 1,
-        discNumber = 1,
-        artists = listOf(MetadataArtist.Basic(id = "a", name = "Artist", thumbnails = emptyList(), externalUri = null)),
-        album = null,
-        thumbnails = emptyList(),
-        explicit = false,
-        popularity = 0,
-        isrcCode = null,
-        externalUri = null)
-
-    private fun allNodes(scene: ImageComposeScene): List<SemanticsNode> {
-        fun flatten(node: SemanticsNode): List<SemanticsNode> = listOf(node) + node.children.flatMap(::flatten)
-        return scene.semanticsOwners.flatMap { flatten(it.rootSemanticsNode) }
-    }
-
-    private fun songTitles(scene: ImageComposeScene): Set<String> = allNodes(scene)
-        .flatMap { it.config.getOrNull(SemanticsProperties.Text).orEmpty() }
-        .map { it.text }
-        .filter { it.startsWith("Song ") }
-        .toSet()
-
-    @Test
-    fun onlyVisibleRowsAreComposedAndTheEndLoadsMore() {
-        val tracks = (0 until 2000).map(::track)
-        val listState = LazyListState()
-        var scope: CoroutineScope? = null
-        var nextPageRequests = 0
-
-        ImageComposeScene(1000, 800) {
-            scope = rememberCoroutineScope()
-            SpotubeTheme(UserSettings(theme = Theme.DARK)) {
-                TrackList(
-                    tracks = tracks,
-                    hasMore = true,
-                    state = listState,
-                    onLoadNextPage = { nextPageRequests++ })
-            }
-        }.use { scene ->
-            repeat(3) { scene.render().close() }
-
-            val visible = songTitles(scene)
-            assertTrue("Song 1" in visible, "first rows render: $visible")
-            assertTrue(visible.size in 3..60, "expected only on-screen rows, composed ${visible.size}")
-            assertEquals(0, nextPageRequests)
-
-            scope!!.launch { listState.scrollToItem(listState.layoutInfo.totalItemsCount - 1) }
-            repeat(3) { scene.render().close() }
-
-            val atEnd = songTitles(scene)
-            assertTrue("Song 1999" in atEnd, "last rows render: ${atEnd.sorted().takeLast(5)}")
-            assertTrue("Song 1" !in atEnd)
-            assertEquals(1, nextPageRequests)
-        }
-    }
-}

composeApp/src/jvmTest/kotlin/org/spotube/spotube/core/ui/misc/UniqueLazyKeysTest.kt

@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2026 Kingkor Roy Tirtho and Spotube Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.spotube.spotube.core.ui.misc
-
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class UniqueLazyKeysTest {
-    @Test
-    fun blankAndRepeatedIdsGetDistinctKeys() {
-        val ids = listOf("a", "", "b", "a", "", "a")
-        val keys = uniqueLazyKeys(ids) { it }
-
-        assertEquals(ids.size, keys.toSet().size)
-        // First occurrences keep their id so scroll position stays stable.
-        assertEquals("a", keys[0])
-        assertEquals("b", keys[2])
-    }
-
-    @Test
-    fun suffixesCannotCollideWithRealIds() {
-        val ids = listOf("a", "a", "a#1", "a1", "a_1")
-        assertEquals(ids.size, uniqueLazyKeys(ids) { it }.toSet().size)
-    }
-}

composeApp/src/jvmTest/kotlin/org/spotube/spotube/modules/library/local_tracks/media/CoverThumbnailTest.kt

@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2026 Kingkor Roy Tirtho and Spotube Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.spotube.spotube.modules.library.local_tracks.media
-
-import org.jetbrains.skia.EncodedImageFormat
-import org.jetbrains.skia.Image
-import org.jetbrains.skia.Paint
-import org.jetbrains.skia.Rect
-import org.jetbrains.skia.Surface
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
-import kotlin.test.assertNull
-import kotlin.test.assertTrue
-
-class CoverThumbnailTest {
-    private fun png(width: Int, height: Int): ByteArray = Surface.makeRasterN32Premul(width, height).use { surface ->
-        // Noise-free but non-uniform so the PNG isn't trivially small.
-        for (x in 0 until width step 7) {
-            surface.canvas.drawRect(Rect.makeXYWH(x.toFloat(), 0f, 3f, height.toFloat()), Paint().apply { color = (0xFF000000.toInt() or (x * 2654435761L).toInt()) })
-        }
-        surface.makeImageSnapshot().use { it.encodeToData(EncodedImageFormat.PNG)!!.bytes }
-    }
-
-    @Test
-    fun largeCoverIsShrunkToASmallJpeg() {
-        val original = png(1600, 1200)
-        val thumbnail = assertNotNull(coverThumbnail(original))
-
-        Image.makeFromEncoded(thumbnail).use { image ->
-            assertEquals(160, minOf(image.width, image.height))
-            assertEquals(213, image.width)
-        }
-        assertTrue(thumbnail.size < 32 * 1024, "thumbnail is ${thumbnail.size} bytes")
-    }
-
-    @Test
-    fun unreadableCoverIsDropped() {
-        assertNull(coverThumbnail(byteArrayOf(1, 2, 3, 4)))
-    }
-}

gradle/libs.versions.toml

@@ -73,7 +73,7 @@ appdirs = { module = "net.harawata:appdirs", version.ref = "appdirs" }
 cache4k = { module = "io.github.reactivecircus.cache4k:cache4k", version.ref = "cache4k" }
 androidx-car-app = { module = "androidx.car.app:app", version.ref = "carApp" }
 compose-shimmer = { module = "com.valentinilk.shimmer:compose-shimmer", version.ref = "composeShimmer" }
-desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs" }
+desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 dns-sd-kt = { module = "com.appstractive:dns-sd-kt", version.ref = "dnssdkt" }
 haze = { module = "dev.chrisbanes.haze:haze", version.ref = "haze" }
 haze-materials = { module = "dev.chrisbanes.haze:haze-blur-materials", version.ref = "haze" }

iosApp/Podfile

@@ -1,9 +0,0 @@
-# MobileVLCKit plays audio on iOS (iosApp/iosApp/VlcPlayerEngine.swift).
-# After `pod install`, open and build iosApp.xcworkspace, not iosApp.xcodeproj.
-platform :ios, '18.2'
-
-target 'iosApp' do
-  use_frameworks!
-
-  pod 'MobileVLCKit', '3.7.5'
-end

iosApp/Podfile.lock

@@ -1,16 +0,0 @@
-PODS:
-  - MobileVLCKit (3.7.5)
-
-DEPENDENCIES:
-  - MobileVLCKit (= 3.7.5)
-
-SPEC REPOS:
-  trunk:
-    - MobileVLCKit
-
-SPEC CHECKSUMS:
-  MobileVLCKit: 9fb4475cd820b2d271ac394d5d7ba18c525332ab
-
-PODFILE CHECKSUM: 6dfb07dbc8a64d0c6fe7231a81687c56f08e8250
-
-COCOAPODS: 1.16.2

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -6,15 +6,8 @@
 	objectVersion = 77;
 	objects = {
 
-/* Begin PBXBuildFile section */
-		EC1521163DBA0344F6C5A520 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F2995B965BD790B4CF9EE4E /* Pods_iosApp.framework */; };
-/* End PBXBuildFile section */
-
 /* Begin PBXFileReference section */
 		11DF02E4B44E5BCF61736473 /* Spotube.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Spotube.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		34377C7B259B7315C03BE940 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = "<group>"; };
-		3F2995B965BD790B4CF9EE4E /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		BA9738EB07A613714DD0F50B /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -38,8 +31,6 @@
 		};
 		E265D0F6D10F52F5C1374EEB /* Configuration */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Configuration;
 			sourceTree = "<group>";
 		};
@@ -50,50 +41,29 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EC1521163DBA0344F6C5A520 /* Pods_iosApp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		835615636B5FE86AA850B7DB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				11DF02E4B44E5BCF61736473 /* Spotube.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		85BADDD666F59900213B22FE /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				3F2995B965BD790B4CF9EE4E /* Pods_iosApp.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		92A495F3BC0A87A606BB8FD4 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				34377C7B259B7315C03BE940 /* Pods-iosApp.debug.xcconfig */,
-				BA9738EB07A613714DD0F50B /* Pods-iosApp.release.xcconfig */,
-			);
-			name = Pods;
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		EFA169D322B90F32841D602F = {
 			isa = PBXGroup;
 			children = (
 				E265D0F6D10F52F5C1374EEB /* Configuration */,
 				5BB730BF90365122B74925FF /* iosApp */,
 				835615636B5FE86AA850B7DB /* Products */,
-				92A495F3BC0A87A606BB8FD4 /* Pods */,
-				85BADDD666F59900213B22FE /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
+		835615636B5FE86AA850B7DB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				11DF02E4B44E5BCF61736473 /* Spotube.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -101,12 +71,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6F8AC65FA015674062B91E20 /* Build configuration list for PBXNativeTarget "iosApp" */;
 			buildPhases = (
-				FD8DD8DB9F90C61C8EB92C92 /* [CP] Check Pods Manifest.lock */,
 				6413B0F29E004BC8B0C4D22A /* Compile Kotlin Framework */,
 				314349EF3C4149F4A4A72378 /* Sources */,
 				EFCF243BC7D8246E008EF23D /* Frameworks */,
 				ED9557BFD7438D37A5E9513D /* Resources */,
-				19DB94093A1327B00D11FC9C /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -116,6 +84,8 @@
 				5BB730BF90365122B74925FF /* iosApp */,
 			);
 			name = iosApp;
+			packageProductDependencies = (
+			);
 			productName = iosApp;
 			productReference = 11DF02E4B44E5BCF61736473 /* Spotube.app */;
 			productType = "com.apple.product-type.application";
@@ -165,23 +135,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		19DB94093A1327B00D11FC9C /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		6413B0F29E004BC8B0C4D22A /* Compile Kotlin Framework */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -201,28 +154,6 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n  echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n  exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :composeApp:embedAndSignAppleFrameworkForXcode\n";
 		};
-		FD8DD8DB9F90C61C8EB92C92 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -236,122 +167,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
-		1C42200356BD14712FAE1CFA /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReferenceAnchor = E265D0F6D10F52F5C1374EEB /* Configuration */;
-			baseConfigurationReferenceRelativePath = Config.xcconfig;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu17;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 18.2;
-				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				MTL_FAST_MATH = YES;
-				SDKROOT = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		4FB276594B17F1A0D71D2462 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = BA9738EB07A613714DD0F50B /* Pods-iosApp.release.xcconfig */;
-			buildSettings = {
-				ARCHS = arm64;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
-				DEVELOPMENT_TEAM = "${TEAM_ID}";
-				ENABLE_PREVIEWS = YES;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = iosApp/Info.plist;
-				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
-				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
-				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-		AC996E9458BD3DAE9610EA49 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 34377C7B259B7315C03BE940 /* Pods-iosApp.debug.xcconfig */;
-			buildSettings = {
-				ARCHS = arm64;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
-				DEVELOPMENT_TEAM = "${TEAM_ID}";
-				ENABLE_PREVIEWS = YES;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = iosApp/Info.plist;
-				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
-				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
-				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
 		AF5828948B37FEEF5EF7F345 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReferenceAnchor = E265D0F6D10F52F5C1374EEB /* Configuration */;
@@ -417,18 +232,123 @@
 			};
 			name = Debug;
 		};
+		1C42200356BD14712FAE1CFA /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReferenceAnchor = E265D0F6D10F52F5C1374EEB /* Configuration */;
+			baseConfigurationReferenceRelativePath = Config.xcconfig;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.2;
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		AC996E9458BD3DAE9610EA49 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = arm64;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				DEVELOPMENT_TEAM = "${TEAM_ID}";
+				ENABLE_PREVIEWS = YES;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = iosApp/Info.plist;
+				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
+				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
+				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		4FB276594B17F1A0D71D2462 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = arm64;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				DEVELOPMENT_TEAM = "${TEAM_ID}";
+				ENABLE_PREVIEWS = YES;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = iosApp/Info.plist;
+				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
+				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
+				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		6F8AC65FA015674062B91E20 /* Build configuration list for PBXNativeTarget "iosApp" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				AC996E9458BD3DAE9610EA49 /* Debug */,
-				4FB276594B17F1A0D71D2462 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		79A44D8DEA428263AC7DC2E1 /* Build configuration list for PBXProject "iosApp" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -438,7 +358,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		6F8AC65FA015674062B91E20 /* Build configuration list for PBXNativeTarget "iosApp" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				AC996E9458BD3DAE9610EA49 /* Debug */,
+				4FB276594B17F1A0D71D2462 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = B056E79C138AE849968965F1 /* Project object */;
-}
+}

iosApp/iosApp.xcworkspace/contents.xcworkspacedata

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:iosApp.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
-</Workspace>

iosApp/iosApp/Info.plist

@@ -4,10 +4,6 @@
 <dict>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>audio</string>
-	</array>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

iosApp/iosApp/VlcPlayerEngine.swift

@@ -1,205 +0,0 @@
-// Copyright (C) 2026 Kingkor Roy Tirtho and Spotube Contributors
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import AVFoundation
-import ComposeApp
-import Foundation
-import MobileVLCKit
-
-/// Registers the MobileVLCKit engine with the shared Kotlin `AudioPlayer`. Call before the first
-/// `ComposeView` is created.
-func registerNativePlayerEngine() {
-    NativePlayerRegistry.shared.factory = VlcPlayerEngineFactory()
-}
-
-final class VlcPlayerEngineFactory: NSObject, NativePlayerEngineFactory {
-    func create() -> NativePlayerEngine {
-        VlcPlayerEngine()
-    }
-}
-
-/// Plays one URL at a time with MobileVLCKit. The Kotlin `AudioPlayer` owns the playlist; see
-/// `NativePlayerEngine.kt` for the contract.
-///
-/// Every VLC call is made on the main queue, in the order the Kotlin side issued it.
-final class VlcPlayerEngine: NSObject, NativePlayerEngine, VLCMediaPlayerDelegate {
-    private let player = VLCMediaPlayer()
-    private var listener: NativePlayerListener?
-    private var released = false
-
-    private var rate: Float = 1
-    private var volumePercent: Int32 = 100
-    private var lastReportedDurationMs: Int64 = 0
-    private var lastReportedState: NativePlayerState?
-
-    override init() {
-        super.init()
-        player.delegate = self
-        try? AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: [])
-    }
-
-    // MARK: NativePlayerEngine
-
-    func setListener(listener: NativePlayerListener?) {
-        onMain { self.listener = listener }
-    }
-
-    func load(url: String, autoPlay: Bool, startPositionMs: Int64) {
-        onMain {
-            guard !self.released else { return }
-            guard let mediaUrl = URL(string: url) else {
-                self.listener?.onError(message: "Invalid URL: \(url)")
-                return
-            }
-
-            let media = VLCMedia(url: mediaUrl)
-            if startPositionMs > 0 {
-                media.addOption(":start-time=\(Double(startPositionMs) / 1000.0)")
-            }
-            self.lastReportedDurationMs = 0
-            self.player.media = media
-            self.report(.opening)
-            if autoPlay { self.startPlayback() }
-        }
-    }
-
-    func play() {
-        onMain {
-            guard !self.released else { return }
-            self.startPlayback()
-        }
-    }
-
-    func pause() {
-        onMain {
-            guard !self.released, self.player.isPlaying else { return }
-            self.player.pause()
-        }
-    }
-
-    func stop() {
-        onMain {
-            guard !self.released else { return }
-            self.player.stop()
-        }
-    }
-
-    func seekTo(positionMs: Int64) {
-        onMain {
-            guard !self.released, self.player.isSeekable else { return }
-            self.player.time = VLCTime(number: NSNumber(value: positionMs))
-        }
-    }
-
-    func setVolume(volume: Float) {
-        onMain {
-            self.volumePercent = Int32((min(max(volume, 0), 1) * 100).rounded())
-            self.player.audio?.volume = self.volumePercent
-        }
-    }
-
-    func setRate(rate: Float) {
-        onMain {
-            self.rate = rate
-            self.player.rate = rate
-        }
-    }
-
-    func destroy() {
-        onMain {
-            guard !self.released else { return }
-            self.released = true
-            self.listener = nil
-            self.player.delegate = nil
-            self.player.stop()
-            self.player.media = nil
-            try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
-        }
-    }
-
-    // MARK: VLCMediaPlayerDelegate
-
-    func mediaPlayerStateChanged(_ aNotification: Notification) {
-        onMain {
-            guard !self.released else { return }
-            switch self.player.state {
-            case .opening:
-                self.report(.opening)
-            case .buffering, .esAdded:
-                // MobileVLCKit keeps sending these while it plays; only a stall counts as buffering.
-                self.report(self.player.isPlaying ? .playing : .buffering)
-            case .playing:
-                self.report(.playing)
-            case .paused:
-                self.report(.paused)
-            case .ended:
-                self.report(.ended)
-            case .stopped:
-                self.report(.idle)
-            case .error:
-                self.listener?.onError(message: "VLC could not play this media")
-                self.report(.idle)
-            default:
-                break
-            }
-        }
-    }
-
-    func mediaPlayerTimeChanged(_ aNotification: Notification) {
-        onMain {
-            guard !self.released else { return }
-            // Time only advances while playing, whatever the last state notification said.
-            if self.player.isPlaying { self.report(.playing) }
-            self.reportDuration()
-            if let ms = self.player.time.value?.int64Value, ms >= 0 {
-                self.listener?.onTime(positionMs: ms)
-            }
-        }
-    }
-
-    // MARK: Internals
-
-    private func startPlayback() {
-        try? AVAudioSession.sharedInstance().setActive(true)
-        player.play()
-    }
-
-    /// Sends [state] to Kotlin unless it was the last one sent.
-    private func report(_ state: NativePlayerState) {
-        guard state != lastReportedState else { return }
-        lastReportedState = state
-        if state == .playing {
-            applyPlaybackSettings()
-            reportDuration()
-        }
-        listener?.onState(state: state)
-    }
-
-    private func applyPlaybackSettings() {
-        player.audio?.volume = volumePercent
-        if player.rate != rate { player.rate = rate }
-    }
-
-    /// MobileVLCKit has no length callback, so the length is read from the media as it plays.
-    private func reportDuration() {
-        guard let ms = player.media?.length.value?.int64Value, ms > 0, ms != lastReportedDurationMs else { return }
-        lastReportedDurationMs = ms
-        listener?.onDuration(durationMs: ms)
-    }
-
-    private func onMain(_ work: @escaping () -> Void) {
-        DispatchQueue.main.async(execute: work)
-    }
-}

iosApp/iosApp/iOSApp.swift

@@ -18,10 +18,6 @@ import ComposeApp
 
 @main
 struct iOSApp: App {
-    init() {
-        registerNativePlayerEngine()
-    }
-
     var body: some Scene {
         WindowGroup {
             ContentView()