nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: remove vtt fix

Browse source
This commit is contained in:
Jarne Demeulemeester 2024-05-12 18:33:01 +02:00
parent c6c5011964
commit 76dcd97ad0
No known key found for this signature in database
GPG key ID: 1E5C6AFBD622E9F5
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt
View file

@ -304,7 +304,6 @@ class JellyfinRepositoryImpl(
responseProfiles = emptyList(), responseProfiles = emptyList(),
subtitleProfiles = listOf( subtitleProfiles = listOf(
SubtitleProfile("srt", SubtitleDeliveryMethod.EXTERNAL), SubtitleProfile("srt", SubtitleDeliveryMethod.EXTERNAL),
SubtitleProfile("vtt", SubtitleDeliveryMethod.EXTERNAL),
SubtitleProfile("ass", SubtitleDeliveryMethod.EXTERNAL), SubtitleProfile("ass", SubtitleDeliveryMethod.EXTERNAL),
), ),
xmlRootAttributes = emptyList(), xmlRootAttributes = emptyList(),

11
player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt
View file

@ -139,20 +139,13 @@ class PlayerViewModel @Inject internal constructor(
mediaStream.isExternal && mediaStream.type == MediaStreamType.SUBTITLE && !mediaStream.path.isNullOrBlank() mediaStream.isExternal && mediaStream.type == MediaStreamType.SUBTITLE && !mediaStream.path.isNullOrBlank()
} }
.map { mediaStream -> .map { mediaStream ->
// Temp fix for vtt
// Jellyfin returns a srt stream when it should return vtt stream.
var deliveryUrl = mediaStream.path!!
if (mediaStream.codec == "webvtt") {
deliveryUrl = deliveryUrl.replace("Stream.srt", "Stream.vtt")
}
ExternalSubtitle( ExternalSubtitle(
mediaStream.title, mediaStream.title,
mediaStream.language, mediaStream.language,
Uri.parse(deliveryUrl), Uri.parse(mediaStream.path!!),
when (mediaStream.codec) { when (mediaStream.codec) {
"subrip" -> MimeTypes.APPLICATION_SUBRIP "subrip" -> MimeTypes.APPLICATION_SUBRIP
"webvtt" -> MimeTypes.TEXT_VTT "webvtt" -> MimeTypes.APPLICATION_SUBRIP
"ass" -> MimeTypes.TEXT_SSA "ass" -> MimeTypes.TEXT_SSA
else -> MimeTypes.TEXT_UNKNOWN else -> MimeTypes.TEXT_UNKNOWN
}, },