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 pull request #3668 from dmitrylyzo/show-play-settings

Browse source
This commit is contained in:
Joshua M. Boniface 2022-06-06 11:52:20 -04:00 • committed by GitHub
commit 0701c4dff3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/playback/playersettingsmenu.js
View file

@ -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); const secondaryQualityText = getQualitySecondaryText(player);
menuItems.push({ menuItems.push({

2
src/controllers/playback/video/index.html
View file

@ -77,7 +77,7 @@
<input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="osdVolumeSlider" /> <input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="osdVolumeSlider" />
</div> </div>
</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> <span class="largePaperIconButton material-icons settings" aria-hidden="true"></span>
</button> </button>
<button is="paper-icon-button-light" class="btnAirPlay hide autoSize" title="${AirPlay}"> <button is="paper-icon-button-light" class="btnAirPlay hide autoSize" title="${AirPlay}">

9
src/controllers/playback/video/index.js
View file

@ -677,12 +677,6 @@ import { appRouter } from '../../../components/appRouter';
updateTimeDisplay(playState.PositionTicks, nowPlayingItem.RunTimeTicks, playState.PlaybackStartTimeTicks, playState.PlaybackRate, playState.BufferedRanges || []); updateTimeDisplay(playState.PositionTicks, nowPlayingItem.RunTimeTicks, playState.PlaybackStartTimeTicks, playState.PlaybackRate, playState.BufferedRanges || []);
updateNowPlayingInfo(player, state); 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; const isProgressClear = state.MediaSource && state.MediaSource.RunTimeTicks == null;
nowPlayingPositionSlider.setIsClear(isProgressClear); nowPlayingPositionSlider.setIsClear(isProgressClear);
@ -860,6 +854,8 @@ import { appRouter } from '../../../components/appRouter';
const player = currentPlayer; const player = currentPlayer;
if (player) { if (player) {
const state = playbackManager.getPlayerState(player);
// show subtitle offset feature only if player and media support it // show subtitle offset feature only if player and media support it
const showSubOffset = playbackManager.supportSubtitleOffset(player) && const showSubOffset = playbackManager.supportSubtitleOffset(player) &&
playbackManager.canHandleOffsetOnCurrentSubtitle(player); playbackManager.canHandleOffsetOnCurrentSubtitle(player);
@ -868,6 +864,7 @@ import { appRouter } from '../../../components/appRouter';
mediaType: 'Video', mediaType: 'Video',
player: player, player: player,
positionTo: btn, positionTo: btn,
quality: state.MediaSource?.SupportsTranscoding,
stats: true, stats: true,
suboffset: showSubOffset, suboffset: showSubOffset,
onOption: onSettingsOption onOption: onSettingsOption