mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-29 17:49:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix subs staying loaded

Browse source
This commit is contained in:
jmir1 2022-03-28 23:15:20 +02:00
parent 009e2962e0
commit 885be41819
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
View file

@ -458,15 +458,9 @@ class PlayerActivity :
player.timePos?.let { player.timePos?.let {
MPVLib.command(arrayOf("set", "start", "${player.timePos}")) MPVLib.command(arrayOf("set", "start", "${player.timePos}"))
} }
subTracks = arrayOf(Track("nothing", "Off")) + it.subtitleTracks.toTypedArray()
audioTracks = arrayOf(Track("nothing", "Off")) + it.audioTracks.toTypedArray()
MPVLib.command(arrayOf("loadfile", it.videoUrl)) MPVLib.command(arrayOf("loadfile", it.videoUrl))
subTracks = arrayOf(Track("nothing", "Off")) + it.subtitleTracks.toTypedArray() +
player.tracks.getValue("sub").map { track ->
Track("mpv", track.name)
}.toTypedArray()
subTracks = arrayOf(Track("nothing", "Off")) + it.subtitleTracks.toTypedArray() +
player.tracks.getValue("audio").map { track ->
Track("mpv", track.name)
}.toTypedArray()
} }
launchUI { refreshUi() } launchUI { refreshUi() }
} }
@ -572,9 +566,9 @@ class PlayerActivity :
MPVLib.command(arrayOf("set", "start", "$intPos")) MPVLib.command(arrayOf("set", "start", "$intPos"))
} }
setViewMode() setViewMode()
MPVLib.command(arrayOf("loadfile", it.videoUrl))
subTracks = arrayOf(Track("nothing", "Off")) + it.subtitleTracks.toTypedArray() subTracks = arrayOf(Track("nothing", "Off")) + it.subtitleTracks.toTypedArray()
audioTracks = arrayOf(Track("nothing", "Off")) + it.audioTracks.toTypedArray() audioTracks = arrayOf(Track("nothing", "Off")) + it.audioTracks.toTypedArray()
MPVLib.command(arrayOf("loadfile", it.videoUrl))
} }
launchUI { refreshUi() } launchUI { refreshUi() }
} }
@ -603,7 +597,26 @@ class PlayerActivity :
// MPVLib.setOptionString("cache-dir", cacheDir) // MPVLib.setOptionString("cache-dir", cacheDir)
} }
private fun clearTracks() {
val count = MPVLib.getPropertyInt("track-list/count")!!
// Note that because events are async, properties might disappear at any moment
// so use ?: continue instead of !!
for (i in 0 until count) {
val type = MPVLib.getPropertyString("track-list/$i/type") ?: continue
if (!player.tracks.containsKey(type)) {
continue
}
val mpvId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
when (type) {
"video" -> MPVLib.command(arrayOf("video-remove", "$mpvId"))
"audio" -> MPVLib.command(arrayOf("audio-remove", "$mpvId"))
"sub" -> MPVLib.command(arrayOf("sub-remove", "$mpvId"))
}
}
}
private fun fileLoaded() { private fun fileLoaded() {
clearTracks()
player.loadTracks() player.loadTracks()
subTracks += player.tracks.getValue("sub") subTracks += player.tracks.getValue("sub")
.drop(1).map { track -> .drop(1).map { track ->