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

unify video osd

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-03 01:51:36 -05:00
parent b3a664583a
commit 407f137095
24 changed files with 713 additions and 6466 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dashboard-ui/components/remotecontrolautoplay.js
View file

@ -1,7 +1,7 @@
define(['events'], function (events) {
define(['events', 'playbackManager'], function (events, playbackManager) {
'use strict';
function transferPlayback(oldPlayer) {
function transferPlayback(oldPlayer, newPlayer) {
oldPlayer.getPlayerState().then(function (state) {
@ -18,7 +18,7 @@
var itemId = item.Id;
var resumePositionTicks = playState.PositionTicks || 0;
MediaController.play({
playbackManager.play({
ids: [itemId],
startPositionTicks: resumePositionTicks
});
@ -26,10 +26,9 @@
});
}
events.on(MediaController, 'playerchange', function (e, newPlayer, newTarget, oldPlayer) {
events.on(playbackManager, 'playerchange', function (e, newPlayer, newTarget, oldPlayer) {
if (!oldPlayer) {
console.log('Skipping remote control autoplay because oldPlayer is null');
if (!oldPlayer || !newPlayer) {
return;
}
@ -45,7 +44,7 @@
// If playback is playing locally and a new player is activated, transfer the media to that player
if (oldPlayer.isPlaying()) {
transferPlayback(oldPlayer);
transferPlayback(oldPlayer, newPlayer);
}
});