From e6b31e3e8575ddec0e84108cd3958b22fbdadc4a Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Mon, 6 Jun 2022 11:52:20 -0400
Subject: [PATCH] Merge pull request #3668 from dmitrylyzo/show-play-settings

(cherry picked from commit 0701c4dff395bde4e87b99155d2f8de74f82b71c)
Signed-off-by: crobibero <cody@robibe.ro>
---
 src/components/playback/playersettingsmenu.js | 3 ++-
 src/controllers/playback/video/index.html     | 2 +-
 src/controllers/playback/video/index.js       | 9 +++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js
index cc05d6e704..c7f8f5a6da 100644
--- a/src/components/playback/playersettingsmenu.js
+++ b/src/components/playback/playersettingsmenu.js
@@ -199,7 +199,8 @@ function showWithUser(options, player, user) {
         });
     }
 
-    if (user && user.Policy.EnableVideoPlaybackTranscoding) {
+    if (options.quality && supportedCommands.includes('SetMaxStreamingBitrate')
+            && user?.Policy?.EnableVideoPlaybackTranscoding) {
         const secondaryQualityText = getQualitySecondaryText(player);
 
         menuItems.push({
diff --git a/src/controllers/playback/video/index.html b/src/controllers/playback/video/index.html
index 3eb3050d49..c76a1714ae 100644
--- a/src/controllers/playback/video/index.html
+++ b/src/controllers/playback/video/index.html
@@ -77,7 +77,7 @@
                         <input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="osdVolumeSlider" />
                     </div>
                 </div>
-                <button is="paper-icon-button-light" class="btnVideoOsdSettings hide autoSize" title="${Settings}">
+                <button is="paper-icon-button-light" class="btnVideoOsdSettings autoSize" title="${Settings}">
                     <span class="largePaperIconButton material-icons settings" aria-hidden="true"></span>
                 </button>
                 <button is="paper-icon-button-light" class="btnAirPlay hide autoSize" title="${AirPlay}">
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index 8dcb8356bd..d5da82b740 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -699,12 +699,6 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
             updateTimeDisplay(playState.PositionTicks, nowPlayingItem.RunTimeTicks, playState.PlaybackStartTimeTicks, playState.PlaybackRate, playState.BufferedRanges || []);
             updateNowPlayingInfo(player, state);
 
-            if (state.MediaSource && state.MediaSource.SupportsTranscoding && supportedCommands.indexOf('SetMaxStreamingBitrate') !== -1) {
-                view.querySelector('.btnVideoOsdSettings').classList.remove('hide');
-            } else {
-                view.querySelector('.btnVideoOsdSettings').classList.add('hide');
-            }
-
             const isProgressClear = state.MediaSource && state.MediaSource.RunTimeTicks == null;
             nowPlayingPositionSlider.setIsClear(isProgressClear);
 
@@ -884,6 +878,8 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
                 const player = currentPlayer;
 
                 if (player) {
+                    const state = playbackManager.getPlayerState(player);
+
                     // show subtitle offset feature only if player and media support it
                     const showSubOffset = playbackManager.supportSubtitleOffset(player) &&
                         playbackManager.canHandleOffsetOnCurrentSubtitle(player);
@@ -892,6 +888,7 @@ import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components
                         mediaType: 'Video',
                         player: player,
                         positionTo: btn,
+                        quality: state.MediaSource?.SupportsTranscoding,
                         stats: true,
                         suboffset: showSubOffset,
                         onOption: onSettingsOption