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

add correct media format profiles to res elements

Browse source
This commit is contained in:
Luke Pulverenti 2014-04-22 20:50:47 -04:00
parent 408fae1db1
commit 87acab5434
2 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

34
dashboard-ui/scripts/mediacontroller.js
View file

@ -16,6 +16,36 @@
});
}
function monitorPlayer(player) {
$(player).on('playbackstart.mediacontroller', function (e, state) {
var info = {
QueueableMediaTypes: state.NowPlayingItem.MediaType,
ItemId: state.NowPlayingItem.Id,
NowPlayingItem: state.NowPlayingItem
};
info = $.extend(info, state.PlayState);
ApiClient.reportPlaybackStart(info);
}).on('playbackstop.mediacontroller', function (e, state) {
ApiClient.reportPlaybackStopped({
itemId: state.NowPlayingItem.Id,
mediaSourceId: state.PlayState.MediaSourceId,
positionTicks: state.PlayState.PositionTicks
});
}).on('positionchange.mediacontroller', function (e, state) {
});
}
function mediaController() {
var self = this;
@ -26,6 +56,10 @@
self.registerPlayer = function (player) {
players.push(player);
if (player.isLocalPlayer) {
monitorPlayer(player);
}
};
self.getPlayerInfo = function () {

26
dashboard-ui/scripts/mediaplayer.js
View file

@ -1059,21 +1059,11 @@
self.updateCanClientSeek(playerElement);
ApiClient.reportPlaybackStart({
itemId: item.Id,
QueueableMediaTypes: item.MediaType,
CanSeek: mediaSource.RunTimeTicks != null,
MediaSourceId: mediaSource.Id,
IsPaused: playerElement.paused,
IsMuted: playerElement.volume == 0,
VolumeLevel: playerElement.volume * 100
});
self.startProgressInterval(item.Id, mediaSource.Id);
var state = self.getPlayerStateInternal(playerElement, item, mediaSource);
$(self).trigger('playbackstart', [state]);
self.startProgressInterval(item.Id, mediaSource.Id);
};
self.onVolumeChanged = function (playerElement) {
@ -1093,23 +1083,11 @@
$(playerElement).off('ended.playbackstopped');
var endTime = playerElement.currentTime;
clearProgressInterval();
var position = Math.floor(10000000 * endTime) + self.startTimeTicksOffset;
var item = currentItem;
var mediaSource = currentMediaSource;
ApiClient.reportPlaybackStopped({
itemId: item.Id,
mediaSourceId: mediaSource.Id,
positionTicks: position
});
if (item.MediaType == "Video") {
ApiClient.stopActiveEncodings();
if (self.isFullScreen()) {