mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #4483 from stamatovg/enable-airplay-audioplayer
enable airplay for audioplayer
This commit is contained in:
commit
cb22736d02
2 changed files with 48 additions and 0 deletions
|
@ -30,6 +30,7 @@ let volumeSlider;
|
||||||
let volumeSliderContainer;
|
let volumeSliderContainer;
|
||||||
let playPauseButtons;
|
let playPauseButtons;
|
||||||
let positionSlider;
|
let positionSlider;
|
||||||
|
let toggleAirPlayButton;
|
||||||
let toggleRepeatButton;
|
let toggleRepeatButton;
|
||||||
let toggleRepeatButtonIcon;
|
let toggleRepeatButtonIcon;
|
||||||
|
|
||||||
|
@ -78,6 +79,8 @@ function getNowPlayingBarHtml() {
|
||||||
html += '<input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="slider-medium-thumb nowPlayingBarVolumeSlider"/>';
|
html += '<input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="slider-medium-thumb nowPlayingBarVolumeSlider"/>';
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
|
|
||||||
|
html += '<button is="paper-icon-button-light" class="btnAirPlay mediaButton"><span class="material-icons airplay" aria-hidden="true"></span></button>';
|
||||||
|
|
||||||
html += '<button is="paper-icon-button-light" class="toggleRepeatButton mediaButton"><span class="material-icons repeat" aria-hidden="true"></span></button>';
|
html += '<button is="paper-icon-button-light" class="toggleRepeatButton mediaButton"><span class="material-icons repeat" aria-hidden="true"></span></button>';
|
||||||
html += '<button is="paper-icon-button-light" class="btnShuffleQueue mediaButton"><span class="material-icons shuffle" aria-hidden="true"></span></button>';
|
html += '<button is="paper-icon-button-light" class="btnShuffleQueue mediaButton"><span class="material-icons shuffle" aria-hidden="true"></span></button>';
|
||||||
|
|
||||||
|
@ -192,6 +195,13 @@ function bindEvents(elem) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
toggleAirPlayButton = elem.querySelector('.btnAirPlay');
|
||||||
|
toggleAirPlayButton.addEventListener('click', function () {
|
||||||
|
if (currentPlayer) {
|
||||||
|
playbackManager.toggleAirPlay(currentPlayer);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
elem.querySelector('.btnShuffleQueue').addEventListener('click', function () {
|
elem.querySelector('.btnShuffleQueue').addEventListener('click', function () {
|
||||||
if (currentPlayer) {
|
if (currentPlayer) {
|
||||||
playbackManager.toggleQueueShuffleMode();
|
playbackManager.toggleQueueShuffleMode();
|
||||||
|
@ -328,6 +338,9 @@ function updatePlayerStateInternal(event, state, player) {
|
||||||
toggleRepeatButton.classList.remove('hide');
|
toggleRepeatButton.classList.remove('hide');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const hideAirPlayButton = supportedCommands.indexOf('AirPlay') === -1;
|
||||||
|
toggleAirPlayButton.classList.toggle('hide', hideAirPlayButton);
|
||||||
|
|
||||||
updateRepeatModeDisplay(playbackManager.getRepeatMode());
|
updateRepeatModeDisplay(playbackManager.getRepeatMode());
|
||||||
onQueueShuffleModeChange();
|
onQueueShuffleModeChange();
|
||||||
|
|
||||||
|
|
|
@ -379,6 +379,10 @@ class HtmlAudioPlayer {
|
||||||
return getDefaultProfile();
|
return getDefaultProfile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toggleAirPlay() {
|
||||||
|
return this.setAirPlayEnabled(!this.isAirPlayEnabled());
|
||||||
|
}
|
||||||
|
|
||||||
// Save this for when playback stops, because querying the time at that point might return 0
|
// Save this for when playback stops, because querying the time at that point might return 0
|
||||||
currentTime(val) {
|
currentTime(val) {
|
||||||
const mediaElement = this._mediaElement;
|
const mediaElement = this._mediaElement;
|
||||||
|
@ -520,6 +524,33 @@ class HtmlAudioPlayer {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
isAirPlayEnabled() {
|
||||||
|
if (document.AirPlayEnabled) {
|
||||||
|
return !!document.AirplayElement;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
setAirPlayEnabled(isEnabled) {
|
||||||
|
const mediaElement = this._mediaElement;
|
||||||
|
|
||||||
|
if (mediaElement) {
|
||||||
|
if (document.AirPlayEnabled) {
|
||||||
|
if (isEnabled) {
|
||||||
|
mediaElement.requestAirPlay().catch(function(err) {
|
||||||
|
console.error('Error requesting AirPlay', err);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
document.exitAirPLay().catch(function(err) {
|
||||||
|
console.error('Error exiting AirPlay', err);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
mediaElement.webkitShowPlaybackTargetPicker();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
supports(feature) {
|
supports(feature) {
|
||||||
if (!supportedFeatures) {
|
if (!supportedFeatures) {
|
||||||
supportedFeatures = getSupportedFeatures();
|
supportedFeatures = getSupportedFeatures();
|
||||||
|
@ -539,6 +570,10 @@ function getSupportedFeatures() {
|
||||||
list.push('PlaybackRate');
|
list.push('PlaybackRate');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (browser.safari) {
|
||||||
|
list.push('AirPlay');
|
||||||
|
}
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue