mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #2627 from BrianCArnold/AddBurnInAll

Browse source 
Added ability to burn in all subtitles, including SRT.
This commit is contained in:
Bill Thornton 2021-05-03 12:39:31 -04:00 • committed by GitHub
commit 7c0eba9853
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/subtitlesettings/subtitlesettings.template.html
View file

@ -28,6 +28,7 @@
<option value="">${Auto}</option> <option value="">${Auto}</option>
<option value="onlyimageformats">${OnlyImageFormats}</option> <option value="onlyimageformats">${OnlyImageFormats}</option>
<option value="allcomplexformats">${AllComplexFormats}</option> <option value="allcomplexformats">${AllComplexFormats}</option>
<option value="all">${All}</option>
</select> </select>
<div class="fieldDescription">${BurnSubtitlesHelp}</div> <div class="fieldDescription">${BurnSubtitlesHelp}</div>
</div> </div>

5
src/scripts/browserDeviceProfile.js
View file

@ -948,13 +948,15 @@ import browser from './browser';
// Subtitle profiles // Subtitle profiles
// External vtt or burn in // External vtt or burn in
profile.SubtitleProfiles = []; profile.SubtitleProfiles = [];
const subtitleBurninSetting = appSettings.get('subtitleburnin');
if (subtitleBurninSetting !== 'all') {
if (supportsTextTracks()) { if (supportsTextTracks()) {
profile.SubtitleProfiles.push({ profile.SubtitleProfiles.push({
Format: 'vtt', Format: 'vtt',
Method: 'External' Method: 'External'
}); });
} }
if (options.enableSsaRender !== false && (!options.isRetry && appSettings.get('subtitleburnin') !== 'allcomplexformats')) { if (options.enableSsaRender !== false && !options.isRetry && subtitleBurninSetting !== 'allcomplexformats') {
profile.SubtitleProfiles.push({ profile.SubtitleProfiles.push({
Format: 'ass', Format: 'ass',
Method: 'External' Method: 'External'
@ -964,6 +966,7 @@ import browser from './browser';
Method: 'External' Method: 'External'
}); });
} }
}
profile.ResponseProfiles = []; profile.ResponseProfiles = [];
profile.ResponseProfiles.push({ profile.ResponseProfiles.push({