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 branch 'master' into osd-tweak

Browse source
This commit is contained in:
Joshua M. Boniface 2020-11-21 12:03:27 -05:00 • committed by GitHub
commit 5954c03c51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 109 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/controllers/dashboard/dashboard.js
View file

@ -30,7 +30,12 @@ import confirm from '../../components/confirm/confirm';
const text = [];
const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
if (displayPlayMethod === 'DirectStream') {
if (displayPlayMethod === 'Remux') {
title = globalize.translate('Remuxing');
text.push(globalize.translate('RemuxHelp1'));
text.push('<br/>');
text.push(globalize.translate('RemuxHelp2'));
} else if (displayPlayMethod === 'DirectStream') {
title = globalize.translate('DirectStreaming');
text.push(globalize.translate('DirectStreamHelp1'));
text.push('<br/>');
@ -397,7 +402,11 @@ import confirm from '../../components/confirm/confirm';
let showTranscodingInfo = false;
const displayPlayMethod = playMethodHelper.getDisplayPlayMethod(session);
if (displayPlayMethod === 'DirectStream') {
if (displayPlayMethod === 'DirectPlay') {
html += globalize.translate('DirectPlaying');
} else if (displayPlayMethod === 'Remux') {
html += globalize.translate('Remuxing');
} else if (displayPlayMethod === 'DirectStream') {
html += globalize.translate('DirectStreaming');
} else if (displayPlayMethod === 'Transcode') {
html += globalize.translate('Transcoding');
@ -407,8 +416,6 @@ import confirm from '../../components/confirm/confirm';
}
showTranscodingInfo = true;
} else if (displayPlayMethod === 'DirectPlay') {
html += globalize.translate('DirectPlaying');
}
if (showTranscodingInfo) {
@ -424,20 +431,20 @@ import confirm from '../../components/confirm/confirm';
}
if (session.TranscodingInfo.Container) {
line.push(session.TranscodingInfo.Container);
line.push(session.TranscodingInfo.Container.toUpperCase());
}
if (session.TranscodingInfo.VideoCodec) {
line.push(session.TranscodingInfo.VideoCodec);
line.push(session.TranscodingInfo.VideoCodec.toUpperCase());
}
if (session.TranscodingInfo.AudioCodec && session.TranscodingInfo.AudioCodec != session.TranscodingInfo.Container) {
line.push(session.TranscodingInfo.AudioCodec);
line.push(session.TranscodingInfo.AudioCodec.toUpperCase());
}
}
if (line.length) {
html += ' - ' + line.join(' ');
html += '<br/><br/>' + line.join(' ');
}
}