diff --git a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt b/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt index 1c6772b4..bcd9e0e5 100644 --- a/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt +++ b/data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt @@ -304,7 +304,6 @@ class JellyfinRepositoryImpl( responseProfiles = emptyList(), subtitleProfiles = listOf( SubtitleProfile("srt", SubtitleDeliveryMethod.EXTERNAL), - SubtitleProfile("vtt", SubtitleDeliveryMethod.EXTERNAL), SubtitleProfile("ass", SubtitleDeliveryMethod.EXTERNAL), ), xmlRootAttributes = emptyList(), diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt b/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt index d01c8e03..88082a91 100644 --- a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt +++ b/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerViewModel.kt @@ -139,20 +139,13 @@ class PlayerViewModel @Inject internal constructor( mediaStream.isExternal && mediaStream.type == MediaStreamType.SUBTITLE && !mediaStream.path.isNullOrBlank() } .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( mediaStream.title, mediaStream.language, - Uri.parse(deliveryUrl), + Uri.parse(mediaStream.path!!), when (mediaStream.codec) { "subrip" -> MimeTypes.APPLICATION_SUBRIP - "webvtt" -> MimeTypes.TEXT_VTT + "webvtt" -> MimeTypes.APPLICATION_SUBRIP "ass" -> MimeTypes.TEXT_SSA else -> MimeTypes.TEXT_UNKNOWN },