From 17142dc6d3d044f6e9f05262256342a8e2681ab5 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Tue, 17 Nov 2020 22:34:02 +0800 Subject: [PATCH 1/3] tweak osd for narrow view --- src/controllers/playback/video/index.html | 6 ++---- src/controllers/playback/video/index.js | 18 +++++++++++++++--- src/elements/emby-slider/emby-slider.css | 2 +- src/elements/emby-slider/emby-slider.js | 4 +++- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/controllers/playback/video/index.html b/src/controllers/playback/video/index.html index 6651fc3da2..26407cf95e 100644 --- a/src/controllers/playback/video/index.html +++ b/src/controllers/playback/video/index.html @@ -13,11 +13,11 @@
-
+
-
+
@@ -46,8 +46,6 @@
- -
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index 492f4aeee9..e6d3cca473 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -760,7 +760,7 @@ import 'css!assets/css/videoosd'; } if (runtimeTicks && positionTicks != null && currentRuntimeTicks && !enableProgressByTimeOfDay && currentItem.RunTimeTicks && currentItem.Type !== 'Recording') { - endsAtText.innerHTML = '  -  ' + mediaInfo.getEndsAtFromPosition(runtimeTicks, positionTicks, true); + endsAtText.innerHTML = '    ' + mediaInfo.getEndsAtFromPosition(runtimeTicks, positionTicks, true); } else { endsAtText.innerHTML = ''; } @@ -770,8 +770,20 @@ import 'css!assets/css/videoosd'; nowPlayingPositionSlider.setBufferedRanges(bufferedRanges, runtimeTicks, positionTicks); } - updateTimeText(nowPlayingPositionText, positionTicks); - updateTimeText(nowPlayingDurationText, runtimeTicks, true); + if (positionTicks >= 0) { + updateTimeText(nowPlayingPositionText, positionTicks); + nowPlayingPositionText.classList.remove('hide'); + } else { + nowPlayingPositionText.classList.add('hide'); + } + + const leftTicks = runtimeTicks - positionTicks; + if (leftTicks >= 0) { + updateTimeText(nowPlayingDurationText, leftTicks); + nowPlayingDurationText.classList.remove('hide'); + } else { + nowPlayingPositionText.classList.add('hide'); + } } } diff --git a/src/elements/emby-slider/emby-slider.css b/src/elements/emby-slider/emby-slider.css index 01221b6cae..f7503d4fd5 100644 --- a/src/elements/emby-slider/emby-slider.css +++ b/src/elements/emby-slider/emby-slider.css @@ -157,7 +157,7 @@ } .mdl-slider-background-flex { - background: #333; + background: rgba(255, 255, 255, 0.3); height: 0.2em; margin-top: -0.1em; width: 100%; diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js index 555394af0d..ded72b338d 100644 --- a/src/elements/emby-slider/emby-slider.js +++ b/src/elements/emby-slider/emby-slider.js @@ -442,7 +442,9 @@ import 'emby-input'; position = (position / runtime) * 100; } - for (const range in ranges) { + for (let i = 0, length = ranges.length; i < length; i++) { + const range = ranges[i]; + if (position != null) { if (position >= range.end) { continue; From d3ee7b68fbb3170f047b86ed5669067cf6461fbd Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Tue, 17 Nov 2020 22:55:48 +0800 Subject: [PATCH 2/3] translation for video aspect ratio --- src/plugins/htmlVideoPlayer/plugin.js | 6 +++--- src/strings/en-us.json | 4 +++- src/strings/zh-cn.json | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js index d2b395ffc6..f669cbaa68 100644 --- a/src/plugins/htmlVideoPlayer/plugin.js +++ b/src/plugins/htmlVideoPlayer/plugin.js @@ -1741,13 +1741,13 @@ function tryRemoveElement(elem) { getSupportedAspectRatios() { return [{ - name: 'Auto', + name: globalize.translate('Auto'), id: 'auto' }, { - name: 'Cover', + name: globalize.translate('AspectRatioCover'), id: 'cover' }, { - name: 'Fill', + name: globalize.translate('AspectRatioFill'), id: 'fill' }]; } diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 4193b05ff5..274562f856 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1428,5 +1428,7 @@ "SubtitleVerticalPositionHelp": "Line number where text appears. Positive numbers indicate top down. Negative numbers indicate bottom up.", "Preview": "Preview", "LabelMaxMuxingQueueSize": "Max muxing queue size:", - "LabelMaxMuxingQueueSizeHelp": "Maximum number of packets that can be buffered while waiting for all streams to initialize. Try to increase it if you still encounter \"Too many packets buffered for output stream\" error in ffmpeg logs. The recommended value is 2048." + "LabelMaxMuxingQueueSizeHelp": "Maximum number of packets that can be buffered while waiting for all streams to initialize. Try to increase it if you still encounter \"Too many packets buffered for output stream\" error in ffmpeg logs. The recommended value is 2048.", + "AspectRatioCover": "Cover", + "AspectRatioFill": "Fill" } diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json index a59866de3b..80818c3602 100644 --- a/src/strings/zh-cn.json +++ b/src/strings/zh-cn.json @@ -1431,5 +1431,7 @@ "OptionAllowContentDownload": "允许媒体下载", "HeaderDeleteDevices": "删除所有设备", "DeleteDevicesConfirmation": "您确定要删除所有设备吗？所有其他会话将被注销。用户下次登录时，设备会重新出现。", - "DeleteAll": "删除全部" + "DeleteAll": "删除全部", + "AspectRatioCover": "覆盖", + "AspectRatioFill": "填充" } From ea8a2d55496dd0f48c5c07eb82eaf147586245f4 Mon Sep 17 00:00:00 2001 From: Nyanmisaka Date: Fri, 20 Nov 2020 23:43:55 +0000 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com> --- src/elements/emby-slider/emby-slider.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js index ded72b338d..671f730cc1 100644 --- a/src/elements/emby-slider/emby-slider.js +++ b/src/elements/emby-slider/emby-slider.js @@ -442,9 +442,7 @@ import 'emby-input'; position = (position / runtime) * 100; } - for (let i = 0, length = ranges.length; i < length; i++) { - const range = ranges[i]; - + for (const range of ranges) { if (position != null) { if (position >= range.end) { continue;