Merge pull request #268 from Alexk2309/fix/default-subtitles-not-showing

Fix default subtitles not working on app.
This commit is contained in:
Fredrik Burmester
2024-12-09 08:55:56 +01:00
committed by GitHub

View File

@@ -17,16 +17,20 @@ const useDefaultPlaySettings = (
// 2. Get default or preferred audio // 2. Get default or preferred audio
const defaultAudioIndex = mediaSource?.DefaultAudioStreamIndex; const defaultAudioIndex = mediaSource?.DefaultAudioStreamIndex;
const preferedAudioIndex = mediaSource?.MediaStreams?.find( const preferedAudioIndex = mediaSource?.MediaStreams?.find(
(x) => x.Language === settings?.defaultAudioLanguage (x) => x.Type === "Audio" && x.Language === settings?.defaultAudioLanguage
)?.Index; )?.Index;
const firstAudioIndex = mediaSource?.MediaStreams?.find( const firstAudioIndex = mediaSource?.MediaStreams?.find(
(x) => x.Type === "Audio" (x) => x.Type === "Audio"
)?.Index; )?.Index;
// 3. Get default or preferred subtitle // 3. Get default or preferred subtitle
const preferedSubtitleIndex = mediaSource?.MediaStreams?.find( const preferedSubtitleIndex = mediaSource?.MediaStreams?.find(
(x) => x.Language === settings?.defaultSubtitleLanguage?.value (x) =>
x.Type === "Subtitle" &&
x.Language === settings?.defaultSubtitleLanguage?.value
)?.Index; )?.Index;
const defaultSubtitleIndex = mediaSource?.MediaStreams?.find( const defaultSubtitleIndex = mediaSource?.MediaStreams?.find(
(stream) => stream.Type === "Subtitle" && stream.IsDefault (stream) => stream.Type === "Subtitle" && stream.IsDefault
)?.Index; )?.Index;
@@ -38,7 +42,9 @@ const useDefaultPlaySettings = (
defaultAudioIndex: defaultAudioIndex:
preferedAudioIndex || defaultAudioIndex || firstAudioIndex || undefined, preferedAudioIndex || defaultAudioIndex || firstAudioIndex || undefined,
defaultSubtitleIndex: defaultSubtitleIndex:
preferedSubtitleIndex || defaultSubtitleIndex || undefined, preferedSubtitleIndex !== undefined
? preferedSubtitleIndex
: defaultSubtitleIndex || undefined,
defaultMediaSource: mediaSource || undefined, defaultMediaSource: mediaSource || undefined,
defaultBitrate: bitrate || undefined, defaultBitrate: bitrate || undefined,
}; };