xx
This commit is contained in:
10
bin/ffx.py
10
bin/ffx.py
@@ -639,7 +639,7 @@ def convert(ctx,
|
|||||||
if streamIndex <= len(subtitleTitles) -1:
|
if streamIndex <= len(subtitleTitles) -1:
|
||||||
mSubtitles[streamIndex]['title'] = subtitleTitles[streamIndex]
|
mSubtitles[streamIndex]['title'] = subtitleTitles[streamIndex]
|
||||||
|
|
||||||
if default_subtitle == -1:
|
if default_subtitle == -1 or no_jellyfin_tweaks:
|
||||||
matchingSubtitles = mSubtitles
|
matchingSubtitles = mSubtitles
|
||||||
else:
|
else:
|
||||||
matchingSubtitles = getReorderedSubstreams(mSubtitles, default_subtitle)
|
matchingSubtitles = getReorderedSubstreams(mSubtitles, default_subtitle)
|
||||||
@@ -689,7 +689,11 @@ def convert(ctx,
|
|||||||
for streamIndex in range(len(audioStreams)):
|
for streamIndex in range(len(audioStreams)):
|
||||||
audioStreams[streamIndex]['disposition']['default'] = 1 if streamIndex == default_audio else 0
|
audioStreams[streamIndex]['disposition']['default'] = 1 if streamIndex == default_audio else 0
|
||||||
|
|
||||||
|
if no_jellyfin_tweaks:
|
||||||
|
sourceAudioStreams = audioStreams
|
||||||
|
else:
|
||||||
sourceAudioStreams = getReorderedSubstreams(audioStreams, default_audio)
|
sourceAudioStreams = getReorderedSubstreams(audioStreams, default_audio)
|
||||||
|
|
||||||
dispositionTokens += generateDispositionTokens(sourceAudioStreams)
|
dispositionTokens += generateDispositionTokens(sourceAudioStreams)
|
||||||
|
|
||||||
# Set forced tag in subtitle descriptor if given per command line option
|
# 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)):
|
for streamIndex in range(len(subtitleStreams)):
|
||||||
subtitleStreams[streamIndex]['disposition']['default'] = 1 if streamIndex == default_subtitle else 0
|
subtitleStreams[streamIndex]['disposition']['default'] = 1 if streamIndex == default_subtitle else 0
|
||||||
|
|
||||||
|
if no_jellyfin_tweaks:
|
||||||
|
sourceSubtitleStreams = subtitleStreams
|
||||||
|
else:
|
||||||
sourceSubtitleStreams = getReorderedSubstreams(subtitleStreams, default_subtitle)
|
sourceSubtitleStreams = getReorderedSubstreams(subtitleStreams, default_subtitle)
|
||||||
|
|
||||||
dispositionTokens += generateDispositionTokens(sourceSubtitleStreams)
|
dispositionTokens += generateDispositionTokens(sourceSubtitleStreams)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user