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

update vaapi defaults

This commit is contained in:
Luke Pulverenti 2016-08-24 16:14:35 -04:00
parent cbca3a20ae
commit ee908c0726
6 changed files with 31 additions and 18 deletions

View file

@ -702,7 +702,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
return html; return html;
} }
function getCardFooterText(item, options, showTitle, forceName, imgUrl, footerClass, progressHtml, isOuterFooter) { function getCardFooterText(item, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, isOuterFooter) {
var html = ''; var html = '';
@ -737,7 +737,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
} }
} }
if (showTitle) { if (showTitle || forceName) {
var name = options.showTitle == 'auto' && !item.IsFolder && item.MediaType == 'Photo' ? '' : itemHelper.getDisplayName(item); var name = options.showTitle == 'auto' && !item.IsFolder && item.MediaType == 'Photo' ? '' : itemHelper.getDisplayName(item);
@ -869,7 +869,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
} }
} }
if (showTitle && forceName && lines.length == 1) { if (showTitle && forceName && overlayText && lines.length == 1) {
lines = []; lines = [];
} }
@ -1022,7 +1022,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var overlayText = options.overlayText; var overlayText = options.overlayText;
if (forceName && !options.cardLayout) { if (forceName && !options.cardLayout) {
showTitle = imgUrl;
if (overlayText == null) { if (overlayText == null) {
overlayText = true; overlayText = true;
@ -1061,7 +1060,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (overlayText) { if (overlayText) {
footerCssClass = progressHtml ? 'innerCardFooter fullInnerCardFooter' : 'innerCardFooter'; footerCssClass = progressHtml ? 'innerCardFooter fullInnerCardFooter' : 'innerCardFooter';
innerCardFooter += getCardFooterText(item, options, showTitle, forceName, imgUrl, footerCssClass, progressHtml, false); innerCardFooter += getCardFooterText(item, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, false);
footerOverlayed = true; footerOverlayed = true;
} }
else if (progressHtml) { else if (progressHtml) {
@ -1080,7 +1079,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var outerCardFooter = ''; var outerCardFooter = '';
if (!overlayText && !footerOverlayed) { if (!overlayText && !footerOverlayed) {
footerCssClass = options.cardLayout ? 'cardFooter visualCardBox-cardFooter' : 'cardFooter transparent'; footerCssClass = options.cardLayout ? 'cardFooter visualCardBox-cardFooter' : 'cardFooter transparent';
outerCardFooter = getCardFooterText(item, options, showTitle, forceName, imgUrl, footerCssClass, progressHtml, true); outerCardFooter = getCardFooterText(item, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, true);
} }
if (outerCardFooter && !options.cardLayout && options.allowBottomPadding !== false) { if (outerCardFooter && !options.cardLayout && options.allowBottomPadding !== false) {

View file

@ -154,6 +154,13 @@
return html; return html;
} }
function onCardOverlayButtonsClick(e) {
var button = dom.parentWithTag(e.target, 'BUTTON');
if (button) {
e.stopPropagation();
}
}
function onShowTimerExpired(elem) { function onShowTimerExpired(elem) {
@ -164,6 +171,10 @@
innerElem.classList.add('hide'); innerElem.classList.add('hide');
innerElem.classList.add('cardOverlayTarget'); innerElem.classList.add('cardOverlayTarget');
// allow the overlay to be clicked to view the item
innerElem.classList.add('itemAction');
innerElem.setAttribute('data-action', 'link');
var appendTo = elem.querySelector('div.cardContent') || elem.querySelector('.cardScalable') || elem.querySelector('.cardBox'); var appendTo = elem.querySelector('div.cardContent') || elem.querySelector('.cardScalable') || elem.querySelector('.cardBox');
//if (appendTo && appendTo.tagName == 'BUTTON') { //if (appendTo && appendTo.tagName == 'BUTTON') {
@ -203,6 +214,8 @@
var user = responses[1]; var user = responses[1];
innerElem.innerHTML = getOverlayHtml(apiClient, item, user, dataElement); innerElem.innerHTML = getOverlayHtml(apiClient, item, user, dataElement);
innerElem.querySelector('.cardOverlayButtons').addEventListener('click', onCardOverlayButtonsClick);
}); });
slideUpToShow(innerElem); slideUpToShow(innerElem);

View file

@ -16,7 +16,8 @@
<div class="fieldDescription">${LabelHardwareAccelerationTypeHelp}</div> <div class="fieldDescription">${LabelHardwareAccelerationTypeHelp}</div>
</div> </div>
<div class="inputContainer hide fldVaapiDevice"> <div class="inputContainer hide fldVaapiDevice">
<input is="emby-input" type="text" id="txtVaapiDevice" label="${LabelVaapiDevice}" /> <input is="emby-input" type="text" id="txtVaapiDevice" label="${LabelVaapiDevice}"/>
<div class="fieldDescription">${LabelVaapiDeviceHelp}</div>
</div> </div>
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectThreadCount" label="${LabelTranscodingThreadCount}"> <select is="emby-select" id="selectThreadCount" label="${LabelTranscodingThreadCount}">

View file

@ -112,15 +112,7 @@
coverImage: item.Type == 'PhotoAlbum' coverImage: item.Type == 'PhotoAlbum'
}; };
if (viewStyle == "Backdrop") { if (viewStyle == "PosterCard") {
posterOptions.shape = 'backdrop';
posterOptions.showTitle = true;
posterOptions.preferBackdrop = true;
html = cardBuilder.getCardsHtml(posterOptions);
}
else if (viewStyle == "PosterCard") {
posterOptions.showTitle = true; posterOptions.showTitle = true;
posterOptions.showYear = true; posterOptions.showYear = true;
@ -137,9 +129,11 @@
}); });
} }
else if (viewStyle == "Thumb") { else if (viewStyle == "Thumb") {
posterOptions.preferThumb = true; posterOptions.preferThumb = true;
posterOptions.showTitle = true;
posterOptions.shape = "backdrop"; posterOptions.shape = "backdrop";
posterOptions.centerText = true;
posterOptions.overlayText = false;
html = cardBuilder.getCardsHtml(posterOptions); html = cardBuilder.getCardsHtml(posterOptions);
} else { } else {

View file

@ -1954,6 +1954,7 @@ var AppInfo = {};
dependencies: ['emby-button', 'emby-input'], dependencies: ['emby-button', 'emby-input'],
autoFocus: false, autoFocus: false,
anonymous: true, anonymous: true,
startup: true,
controller: 'scripts/connectlogin' controller: 'scripts/connectlogin'
}); });
@ -2053,6 +2054,7 @@ var AppInfo = {};
path: '/forgotpassword.html', path: '/forgotpassword.html',
dependencies: ['emby-input', 'emby-button'], dependencies: ['emby-input', 'emby-button'],
anonymous: true, anonymous: true,
startup: true,
controller: 'scripts/forgotpassword' controller: 'scripts/forgotpassword'
}); });
@ -2061,6 +2063,7 @@ var AppInfo = {};
dependencies: ['emby-input', 'emby-button'], dependencies: ['emby-input', 'emby-button'],
autoFocus: false, autoFocus: false,
anonymous: true, anonymous: true,
startup: true,
controller: 'scripts/forgotpasswordpin' controller: 'scripts/forgotpasswordpin'
}); });
@ -2242,6 +2245,7 @@ var AppInfo = {};
dependencies: ['emby-button', 'humanedate', 'emby-input'], dependencies: ['emby-button', 'humanedate', 'emby-input'],
autoFocus: false, autoFocus: false,
anonymous: true, anonymous: true,
startup: true,
controller: 'scripts/loginpage' controller: 'scripts/loginpage'
}); });
@ -2471,6 +2475,7 @@ var AppInfo = {};
dependencies: ['listViewStyle', 'emby-button'], dependencies: ['listViewStyle', 'emby-button'],
autoFocus: false, autoFocus: false,
anonymous: true, anonymous: true,
startup: true,
controller: 'scripts/selectserver' controller: 'scripts/selectserver'
}); });

View file

@ -2323,5 +2323,6 @@
"HeaderOfflineSync": "Offline Sync", "HeaderOfflineSync": "Offline Sync",
"LabelMaxAudioFileBitrate": "Max audio file bitrate:", "LabelMaxAudioFileBitrate": "Max audio file bitrate:",
"LabelMaxAudioFileBitrateHelp": "Audio files with a higher bitrate will be converted by Emby Server. Select a higher value for better quality, or a lower value to conserve local storage space.", "LabelMaxAudioFileBitrateHelp": "Audio files with a higher bitrate will be converted by Emby Server. Select a higher value for better quality, or a lower value to conserve local storage space.",
"LabelVaapiDevice": "VA API Device:" "LabelVaapiDevice": "VA API Device:",
"LabelVaapiDeviceHelp": "This is the render node that is used for hardware acceleration."
} }