添加禁用字幕选项 (#1115)

open-ani · Oct 28, 2024 · c16c91a · c16c91a
1 parent 6d065fb
commit c16c91a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/shared/video-player/src/androidMain/kotlin/PlayerState.android.kt b/app/shared/video-player/src/androidMain/kotlin/PlayerState.android.kt
@@ -230,13 +230,19 @@ internal class ExoPlayerState @UiThread constructor(
                     }
 
                     override fun onTracksChanged(tracks: Tracks) {
-                        subtitleTracks.candidates.value =
+                        val newSubtitleTracks =
                             tracks.groups.asSequence()
                                 .filter { it.type == C.TRACK_TYPE_TEXT }
                                 .flatMapIndexed { groupIndex: Int, group: Tracks.Group ->
                                     group.getSubtitleTracks()
                                 }
                                 .toList()
+                        // 新的字幕轨道和原来不同时才会更改，同时将 current 设置为新字幕轨道列表的第一个
+                        if (newSubtitleTracks != subtitleTracks.candidates.value) {
+                            subtitleTracks.candidates.value = newSubtitleTracks
+                            subtitleTracks.current.value = newSubtitleTracks.firstOrNull()
+                        }
+
                         audioTracks.candidates.value =
                             tracks.groups.asSequence()
                                 .filter { it.type == C.TRACK_TYPE_AUDIO }
@@ -385,6 +391,7 @@ internal class ExoPlayerState @UiThread constructor(
             subtitleTracks.current.collect {
                 player.trackSelectionParameters = player.trackSelectionParameters.buildUpon().apply {
                     setPreferredTextLanguage(it?.internalId) // dummy value to trigger a select, we have custom selector
+                    setTrackTypeDisabled(C.TRACK_TYPE_TEXT, it == null) // disable subtitle track
                 }.build()
             }
         }

diff --git a/app/shared/video-player/src/commonMain/kotlin/ui/progress/SubtitleSwitcher.kt b/app/shared/video-player/src/commonMain/kotlin/ui/progress/SubtitleSwitcher.kt
@@ -90,7 +90,7 @@ fun PlayerControllerDefaults.SubtitleSwitcher(
         optionsProvider = { options },
         renderValue = {
             if (it == null) {
-                Text("自动")
+                Text("关闭")
             } else {
                 Text(it.displayName, maxLines = 1, overflow = TextOverflow.Ellipsis)
             }

diff --git a/app/shared/video-player/src/desktopMain/kotlin/ui/VideoPlayer.desktop.kt b/app/shared/video-player/src/desktopMain/kotlin/ui/VideoPlayer.desktop.kt
@@ -451,6 +451,7 @@ class VlcjVideoPlayerState(parentCoroutineContext: CoroutineContext) : PlayerSta
                     listOf(Label(null, it.description())),
                 )
             }
+        subtitleTracks.current.value = subtitleTracks.candidates.value.firstOrNull()
     }
 
     private fun reloadAudioTracks() {