Home screen and movie page

core/data/src/main/kotlin/ru/stenfredd/movies/core/data/Mapping.kt

@@ -144,8 +144,9 @@ private fun MediaSourceInfo.toMediaInfo(): MediaInfo {
         video = streams.firstOrNull { it.type == MediaStreamType.VIDEO }?.toVideo(),
         audio = streams.filter { it.type == MediaStreamType.AUDIO }.map { it.toAudio(defaultAudioStreamIndex) },
         subtitles = streams.filter { it.type == MediaStreamType.SUBTITLE }.map { it.toSubtitle(defaultSubtitleStreamIndex) },
-        defaultAudioIndex = defaultAudioStreamIndex,
-        defaultSubtitleIndex = defaultSubtitleStreamIndex,
+        defaultAudioIndex = defaultAudioStreamIndex?.takeIf { it >= 0 },
+        // -1 is the server's "no subtitles".
+        defaultSubtitleIndex = defaultSubtitleStreamIndex?.takeIf { it >= 0 },
     )
 }
 
@@ -171,8 +172,10 @@ private fun VideoRangeType.toRange(): VideoRange = when {
 private fun MediaStream.toAudio(defaultIndex: Int?) = AudioTrack(
     index = index,
     title = displayTitle ?: title ?: codec.orEmpty(),
+    name = title?.takeIf { it.isNotBlank() },
     language = language,
     codec = codec,
+    profile = profile,
     channels = channels,
     atmos = audioSpatialFormat == AudioSpatialFormat.DOLBY_ATMOS || profile?.contains("Atmos", ignoreCase = true) == true,
     isDefault = index == defaultIndex,
@@ -181,6 +184,7 @@ private fun MediaStream.toAudio(defaultIndex: Int?) = AudioTrack(
 private fun MediaStream.toSubtitle(defaultIndex: Int?) = SubtitleTrack(
     index = index,
     title = displayTitle ?: title ?: codec.orEmpty(),
+    name = title?.takeIf { it.isNotBlank() },
     language = language,
     codec = codec,
     external = isExternal,

core/data/src/main/kotlin/ru/stenfredd/movies/core/data/model/Models.kt

@@ -143,9 +143,14 @@ enum class VideoRange { SDR, HDR10, HDR10Plus, HLG, DolbyVision, Other }
 
 data class AudioTrack(
     val index: Int,
+    /** Server's display title ("Russian - Dolby TrueHD + Dolby Atmos 7.1 - Default"). */
     val title: String,
+    /** The stream's own title from the file ("MVO, HDRezka"): tells apart tracks of one language. */
+    val name: String?,
     val language: String?,
     val codec: String?,
+    /** Codec profile ("DTS-HD MA"). */
+    val profile: String?,
     val channels: Int?,
     /** Dolby Atmos (TrueHD or E-AC-3 JOC). */
     val atmos: Boolean,
@@ -155,6 +160,8 @@ data class AudioTrack(
 data class SubtitleTrack(
     val index: Int,
     val title: String,
+    /** The stream's own title from the file ("Надписи", "Full"). */
+    val name: String?,
     val language: String?,
     val codec: String?,
     val external: Boolean,