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

update osd

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-03 02:02:47 -05:00
parent 407f137095
commit 3e2ad02767
5 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.432",
"_release": "1.4.432",
"version": "1.4.434",
"_release": "1.4.434",
"_resolution": {
"type": "version",
"tag": "1.4.432",
"commit": "c3372557ec7525f1dafea755825bc6a0b353a8e6"
"tag": "1.4.434",
"commit": "7272c3f5081280de5b30ba3cdbe90c1a925dd96a"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

9
dashboard-ui/bower_components/emby-webcomponents/htmlvideoplayer/plugin.js vendored
View file

@ -42,7 +42,7 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
}
function getBaseProfileOptions(item) {
var disableHlsVideoAudioCodecs = [];
if (!canPlayNativeHls() || (browser.edge && !item.RunTimeTicks)) {
// hls.js does not support these
@ -196,7 +196,9 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
requireHlsPlayer(function () {
var hls = new Hls({
manifestLoadingTimeOut: 20000
manifestLoadingTimeOut: 20000,
//appendErrorMaxRetry: 6,
//debug: true
});
hls.loadSource(val);
hls.attachMedia(elem);
@ -205,6 +207,9 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
});
hls.on(Hls.Events.ERROR, function (event, data) {
console.log('HLS Error: Type: ' + data.type + ' Details: ' + (data.details || '') + ' Fatal: ' + data.fatal);
if (data.fatal) {
switch (data.type) {
case Hls.ErrorTypes.NETWORK_ERROR:

6
dashboard-ui/bower_components/emby-webcomponents/htmlvideoplayer/style.css vendored
View file

@ -6,14 +6,18 @@
right: 0;
display: flex;
align-items: center;
background: #000 !important;
}
.videoPlayerContainer:not(.videoPlayerContainer-withBackdrop) {
background: #000 !important;
}
.videoPlayerContainer-withBackdrop {
background-repeat: no-repeat;
background-position: center center;
background-size: cover;
background-attachment: fixed;
background-color: #000;
}
.videoPlayerContainer-onTop {

51
dashboard-ui/bower_components/emby-webcomponents/playback/remotecontrolautoplay.js vendored Normal file
View file

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