From e3964b000229a38a84ad6c1025c51cf45141d2cd Mon Sep 17 00:00:00 2001 From: Maveno Date: Sun, 15 Sep 2024 09:21:43 +0200 Subject: [PATCH] xx --- bin/ffx.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/ffx.py b/bin/ffx.py index c07623c..3f5ec6f 100755 --- a/bin/ffx.py +++ b/bin/ffx.py @@ -639,7 +639,7 @@ def convert(ctx, if streamIndex <= len(subtitleTitles) -1: mSubtitles[streamIndex]['title'] = subtitleTitles[streamIndex] - if default_subtitle == -1: + if default_subtitle == -1 or no_jellyfin_tweaks: matchingSubtitles = mSubtitles else: matchingSubtitles = getReorderedSubstreams(mSubtitles, default_subtitle) @@ -689,7 +689,11 @@ def convert(ctx, for streamIndex in range(len(audioStreams)): audioStreams[streamIndex]['disposition']['default'] = 1 if streamIndex == default_audio else 0 - sourceAudioStreams = getReorderedSubstreams(audioStreams, default_audio) + if no_jellyfin_tweaks: + sourceAudioStreams = audioStreams + else: + sourceAudioStreams = getReorderedSubstreams(audioStreams, default_audio) + dispositionTokens += generateDispositionTokens(sourceAudioStreams) # Set forced tag in subtitle descriptor if given per command line option @@ -704,7 +708,11 @@ def convert(ctx, for streamIndex in range(len(subtitleStreams)): subtitleStreams[streamIndex]['disposition']['default'] = 1 if streamIndex == default_subtitle else 0 - sourceSubtitleStreams = getReorderedSubstreams(subtitleStreams, default_subtitle) + if no_jellyfin_tweaks: + sourceSubtitleStreams = subtitleStreams + else: + sourceSubtitleStreams = getReorderedSubstreams(subtitleStreams, default_subtitle) + dispositionTokens += generateDispositionTokens(sourceSubtitleStreams)