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 #5740 from dmitrylyzo/fix-tv-volume

Browse source 
Don't change volume if it is physically controlled
This commit is contained in:
Bill Thornton 2024-07-09 23:38:47 -04:00 • committed by GitHub
commit e0a0c92b43
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/playback/playbackmanager.js
View file

@ -33,6 +33,10 @@ function enableLocalPlaylistManagement(player) {
return player.isLocalPlayer; return player.isLocalPlayer;
} }
function supportsPhysicalVolumeControl(player) {
return player.isLocalPlayer && appHost.supports('physicalvolumecontrol');
}
function bindToFullscreenChange(player) { function bindToFullscreenChange(player) {
if (Screenfull.isEnabled) { if (Screenfull.isEnabled) {
Screenfull.on('change', function () { Screenfull.on('change', function () {
@ -1157,7 +1161,7 @@ class PlaybackManager {
self.setVolume = function (val, player) { self.setVolume = function (val, player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player) { if (player && !supportsPhysicalVolumeControl(player)) {
player.setVolume(val); player.setVolume(val);
} }
}; };
@ -1165,15 +1169,17 @@ class PlaybackManager {
self.getVolume = function (player) { self.getVolume = function (player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player) { if (player && !supportsPhysicalVolumeControl(player)) {
return player.getVolume(); return player.getVolume();
} }
return 1;
}; };
self.volumeUp = function (player) { self.volumeUp = function (player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player) { if (player && !supportsPhysicalVolumeControl(player)) {
player.volumeUp(); player.volumeUp();
} }
}; };
@ -1181,7 +1187,7 @@ class PlaybackManager {
self.volumeDown = function (player) { self.volumeDown = function (player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player) { if (player && !supportsPhysicalVolumeControl(player)) {
player.volumeDown(); player.volumeDown();
} }
}; };

5
src/plugins/htmlAudioPlayer/plugin.js
View file

@ -263,7 +263,10 @@ class HtmlAudioPlayer {
document.body.appendChild(elem); document.body.appendChild(elem);
} }
elem.volume = htmlMediaHelper.getSavedVolume(); // TODO: Move volume control to PlaybackManager. Player should just be a wrapper that translates commands into API calls.
if (!appHost.supports('physicalvolumecontrol')) {
elem.volume = htmlMediaHelper.getSavedVolume();
}
self._mediaElement = elem; self._mediaElement = elem;

6
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -1584,7 +1584,11 @@ export class HtmlVideoPlayer {
playerDlg.innerHTML = html; playerDlg.innerHTML = html;
const videoElement = playerDlg.querySelector('video'); const videoElement = playerDlg.querySelector('video');
videoElement.volume = getSavedVolume(); // TODO: Move volume control to PlaybackManager. Player should just be a wrapper that translates commands into API calls.
if (!appHost.supports('physicalvolumecontrol')) {
videoElement.volume = getSavedVolume();
}
videoElement.addEventListener('timeupdate', this.onTimeUpdate); videoElement.addEventListener('timeupdate', this.onTimeUpdate);
videoElement.addEventListener('ended', this.onEnded); videoElement.addEventListener('ended', this.onEnded);
videoElement.addEventListener('volumechange', this.onVolumeChange); videoElement.addEventListener('volumechange', this.onVolumeChange);