+
+
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index 7495110f7e..8dc8f675ee 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -11,6 +11,9 @@
$('#txtTranscodingTempPath', page).val(config.TranscodingTempPath || '');
$('#txtVaapiDevice', page).val(config.VaapiDevice || '');
+ page.querySelector('#selectH264Preset').value = config.H264Preset || '';
+ page.querySelector('#txtH264Crf').value = config.H264Crf || '';
+
var selectEncoderPath = page.querySelector('#selectEncoderPath');
selectEncoderPath.value = systemInfo.EncoderLocationType;
@@ -71,6 +74,9 @@
config.HardwareAccelerationType = $('#selectVideoDecoder', form).val();
config.VaapiDevice = $('#txtVaapiDevice', form).val();
+ config.H264Preset = form.querySelector('#selectH264Preset').value;
+ config.H264Crf = parseInt(form.querySelector('#txtH264Crf').value || '0');
+
config.EnableThrottling = form.querySelector('#chkEnableThrottle').checked;
ApiClient.updateNamedConfiguration("encoding", config).then(function () {
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 2550b970b2..2697b4d42d 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -155,21 +155,10 @@
});
}
- function renderUpcomingRecordings(context) {
-
- ApiClient.getLiveTvTimers({
- IsActive: false
- }).then(function (result) {
-
- renderTimers(context.querySelector('#upcomingRecordings'), result.Items);
- });
- }
-
function reload(context) {
Dashboard.showLoadingMsg();
- renderUpcomingRecordings(context);
renderActiveRecordings(context);
renderLatestRecordings(context);
@@ -191,9 +180,6 @@
tabContent.querySelector('#activeRecordings .recordingItems').addEventListener('timercancelled', function () {
reload(tabContent);
});
-
tabContent.querySelector('#upcomingRecordings .recordingItems').addEventListener('timercancelled', function () {
- reload(tabContent);
- });
self.renderTab = function () {
reload(tabContent);
diff --git a/dashboard-ui/scripts/livetvschedule.js b/dashboard-ui/scripts/livetvschedule.js
new file mode 100644
index 0000000000..01929ce34a
--- /dev/null
+++ b/dashboard-ui/scripts/livetvschedule.js
@@ -0,0 +1,53 @@
+define(['components/categorysyncbuttons', 'cardBuilder', 'scripts/livetvcomponents', 'emby-button', 'listViewStyle', 'emby-itemscontainer'], function (categorysyncbuttons, cardBuilder) {
+
+ function renderTimers(context, timers, options) {
+
+ LiveTvHelpers.getTimersHtml(timers, options).then(function (html) {
+
+ var elem = context;
+
+ if (html) {
+ elem.classList.remove('hide');
+ } else {
+ elem.classList.add('hide');
+ }
+
+ elem.querySelector('.recordingItems').innerHTML = html;
+
+ ImageLoader.lazyChildren(elem);
+ });
+ }
+
+ function renderUpcomingRecordings(context) {
+
+ ApiClient.getLiveTvTimers({
+ IsActive: false
+ }).then(function (result) {
+
+ renderTimers(context.querySelector('#upcomingRecordings'), result.Items);
+ Dashboard.hideLoadingMsg();
+ });
+ }
+
+ function reload(context) {
+
+ Dashboard.showLoadingMsg();
+
+ renderUpcomingRecordings(context);
+ }
+
+ return function (view, params, tabContent) {
+
+ var self = this;
+
+ categorysyncbuttons.init(tabContent);
+
tabContent.querySelector('#upcomingRecordings .recordingItems').addEventListener('timercancelled', function () {
+ reload(tabContent);
+ });
+
+ self.renderTab = function () {
+ reload(tabContent);
+ };
+ };
+
+});
\ No newline at end of file
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 3427bc0a7e..c20e4ee016 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -101,7 +101,7 @@
var html = cardBuilder.getCardsHtml({
items: items,
- shape: shape || (enableScrollX() ? 'autooverflow' : 'auto'),
+ shape: shape || (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
showTitle: true,
centerText: true,
coverImage: true,
@@ -169,6 +169,10 @@
depends.push('scripts/livetvrecordings');
break;
case 4:
+ document.body.classList.remove('autoScrollY');
+ depends.push('scripts/livetvschedule');
+ break;
+ case 5:
document.body.classList.remove('autoScrollY');
depends.push('scripts/livetvseriestimers');
break;
@@ -200,7 +204,7 @@
var viewTabs = view.querySelector('.libraryViewNav');
- libraryBrowser.configurePaperLibraryTabs(view, viewTabs, view.querySelectorAll('.pageTabContent'), [0, 2, 3, 4]);
+ libraryBrowser.configurePaperLibraryTabs(view, viewTabs, view.querySelectorAll('.pageTabContent'), [0, 2, 3, 4, 5]);
viewTabs.addEventListener('tabchange', function (e) {
loadTab(view, parseInt(e.detail.selectedTabIndex));
diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json
index 7943dcf244..37f800ab42 100644
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@@ -2127,5 +2127,9 @@
"OptionExtractChapterImage": "Enable chapter image extraction",
"Downloads": "Downloads",
"OptionEnableExternalContentInSuggestions": "Enable external content in suggestions",
- "OptionEnableExternalContentInSuggestionsHelp": "Allow internet trailers and live tv programs to be included within suggested content."
+ "OptionEnableExternalContentInSuggestionsHelp": "Allow internet trailers and live tv programs to be included within suggested content.",
+ "LabelH264EncodingPreset": "H264 encoding preset:",
+ "H264EncodingPresetHelp": "Choose a faster value to improve performance, or a slower value to improve quality.",
+ "LabelH264Crf": "H264 encoding CRF:",
+ "H264CrfHelp": "The Constant Rate Factor (CRF) is the default quality setting for the x264 encoder. You can set the values between 0 and 51, where lower values would result in better quality (at the expense of higher file sizes). Sane values are between 18 and 28. The default for x264 is 23, so you can use this as a starting point."
}