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 desktop video player osd

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-11 13:57:59 -04:00
parent 8f71cd9871
commit f13e19c928
4 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/css/mediaplayer-video.css
View file

@ -148,7 +148,7 @@
} }
.videoNowPlayingName { .videoNowPlayingName {
font-size: 22px; font-size: 18px;
} }
.videoNowPlayingOverview, .videoNowPlayingRating { .videoNowPlayingOverview, .videoNowPlayingRating {
@ -221,7 +221,7 @@
} }
} }
@media all and (max-width: 800px), all and (max-height: 600px) { @media all and (max-width: 1400px), all and (max-height: 800px) {
#mediaPlayer .nowPlayingInfo { #mediaPlayer .nowPlayingInfo {
display: none !important; display: none !important;
@ -252,7 +252,7 @@
#videoPlayer .nowPlayingImage img { #videoPlayer .nowPlayingImage img {
height: auto !important; height: auto !important;
max-width: 400px; max-width: 400px;
max-height: 280px; max-height: 240px;
} }
} }

2
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -135,6 +135,8 @@
.on('play', onPlay) .on('play', onPlay)
.on('pause', onPause) .on('pause', onPause)
.on('playing', onPlaying) .on('playing', onPlaying)
.on('click', onClick)
.on('dblclick', onDblClick)
.on('error', onError)[0]; .on('error', onError)[0];
} }

2
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -395,7 +395,7 @@
var chapterIndex = 0; var chapterIndex = 0;
html += item.Chapters.map(function (c) { html += item.Chapters.map(function (c) {
var width = 320; var width = 240;
var chapterHtml = '<a class="card backdropCard chapterCard" href="#" style="margin-right:1em;width:' + width + 'px;" data-position="' + c.StartPositionTicks + '">'; var chapterHtml = '<a class="card backdropCard chapterCard" href="#" style="margin-right:1em;width:' + width + 'px;" data-position="' + c.StartPositionTicks + '">';
chapterHtml += '<div class="cardBox">'; chapterHtml += '<div class="cardBox">';
chapterHtml += '<div class="cardScalable">'; chapterHtml += '<div class="cardScalable">';

13
dashboard-ui/thirdparty/cordova/android/mediasession.js vendored
View file

@ -4,6 +4,7 @@
var currentPlayer; var currentPlayer;
var lastPlayerState; var lastPlayerState;
var lastUpdateTime;
function updatePlayerState(state, eventName) { function updatePlayerState(state, eventName) {
@ -29,6 +30,7 @@
var album = state.NowPlayingItem.Album || ''; var album = state.NowPlayingItem.Album || '';
var duration = state.NowPlayingItem.RunTimeTicks ? (state.NowPlayingItem.RunTimeTicks / 10000000) : 0; var duration = state.NowPlayingItem.RunTimeTicks ? (state.NowPlayingItem.RunTimeTicks / 10000000) : 0;
var position = playState.PositionTicks ? (playState.PositionTicks / 10000000) : 0; var position = playState.PositionTicks ? (playState.PositionTicks / 10000000) : 0;
var itemId = state.NowPlayingItem.Id;
var isPaused = playState.IsPaused || false; var isPaused = playState.IsPaused || false;
var canSeek = playState.CanSeek || false; var canSeek = playState.CanSeek || false;
@ -64,7 +66,16 @@
} }
MainActivity.updateMediaSession(eventName, title, artist, album, parseInt(duration), parseInt(position), url, canSeek, isPaused); // Don't go crazy reporting position changes
if (eventName == 'positionchange') {
var time = new Date().getTime();
if ((time - lastUpdateTime) < 500) {
return;
}
}
MainActivity.updateMediaSession(eventName, itemId, title, artist, album, parseInt(duration), parseInt(position), url, canSeek, isPaused);
lastUpdateTime = new Date().getTime();
} }
function onStateChanged(e, state) { function onStateChanged(e, state) {