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

update selection buttons

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-14 12:39:34 -04:00
parent 59a3cada00
commit 1c27cdeb2c
35 changed files with 226 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

38
dashboard-ui/scripts/mediaplayer.js
View file

@ -411,12 +411,29 @@
// External vtt or burn in
profile.SubtitleProfiles = [];
if (self.supportsTextTracks()) {
profile.SubtitleProfiles.push({
Format: 'vtt',
Method: 'External'
});
if (isVlc) {
profile.SubtitleProfiles.push({
Format: 'srt',
Method: 'External'
});
profile.SubtitleProfiles.push({
Format: 'srt',
Method: 'Embed'
});
profile.SubtitleProfiles.push({
Format: 'ass',
Method: 'Embed'
});
profile.SubtitleProfiles.push({
Format: 'ssa',
Method: 'Embed'
});
profile.SubtitleProfiles.push({
Format: 'pgs',
Method: 'Embed'
});
} else {
profile.SubtitleProfiles.push({
Format: 'vtt',
Method: 'External'
@ -823,7 +840,12 @@
contentType = 'video/' + mediaSource.Container;
if (mediaSource.enableDirectPlay) {
mediaUrl = FileSystemBridge.translateFilePath(mediaSource.Path);
mediaUrl = mediaSource.Path;
if (mediaSource.Protocol == 'File') {
mediaUrl = FileSystemBridge.translateFilePath(mediaUrl);
}
playMethod = 'DirectPlay';
} else {
@ -860,7 +882,11 @@
if (mediaSource.enableDirectPlay) {
mediaUrl = FileSystemBridge.translateFilePath(mediaSource.Path);
mediaUrl = mediaSource.Path;
if (mediaSource.Protocol == 'File') {
mediaUrl = FileSystemBridge.translateFilePath(mediaUrl);
}
playMethod = 'DirectPlay';
} else {