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 client sync

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-11 12:26:06 -04:00
parent a2d603a31e
commit e96f1d7e00
13 changed files with 62 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

42
dashboard-ui/cordova/android/vlcplayer.js vendored
View file

@ -92,39 +92,39 @@
function getPlaybackStartInfoForVideoActivity(videoUrl, mediaSource, item) {
var state = {
PlayState: {}
var playbackStartInfo = {
QueueableMediaTypes: item.MediaType,
ItemId: item.Id,
NowPlayingItem: {},
MediaSourceId: mediaSource.Id
};
if (mediaSource.RunTimeTicks) {
playbackStartInfo.NowPlayingItem.RunTimeTicks = mediaSource.RunTimeTicks;
}
var audioStreamIndex = getParameterByName('AudioStreamIndex', videoUrl);
if (audioStreamIndex) {
state.PlayState.AudioStreamIndex = parseInt(audioStreamIndex);
playbackStartInfo.AudioStreamIndex = parseInt(audioStreamIndex);
}
if (self.currentSubtitleStreamIndex != null) {
playbackStartInfo.SubtitleStreamIndex = self.currentSubtitleStreamIndex;
}
state.PlayState.SubtitleStreamIndex = self.currentSubtitleStreamIndex;
state.PlayState.PlayMethod = getParameterByName('static', videoUrl) == 'true' ?
playbackStartInfo.PlayMethod = getParameterByName('static', videoUrl) == 'true' ?
'DirectStream' :
'Transcode';
state.PlayState.LiveStreamId = getParameterByName('LiveStreamId', videoUrl);
state.PlayState.PlaySessionId = getParameterByName('PlaySessionId', videoUrl);
playbackStartInfo.LiveStreamId = getParameterByName('LiveStreamId', videoUrl);
playbackStartInfo.PlaySessionId = getParameterByName('PlaySessionId', videoUrl);
state.PlayState.MediaSourceId = mediaSource.Id;
// Seeing some deserialization errors around this property
if (mediaSource.RunTimeTicks && mediaSource.RunTimeTicks > 0) {
playbackStartInfo.CanSeek = true;
}
state.NowPlayingItem = {
RunTimeTicks: mediaSource.RunTimeTicks
};
state.PlayState.CanSeek = mediaSource.RunTimeTicks && mediaSource.RunTimeTicks > 0;
var playbackStartInfo = {
QueueableMediaTypes: item.MediaType,
ItemId: item.Id,
NowPlayingItem: state.NowPlayingItem
};
return $.extend(playbackStartInfo, state.PlayState);
return playbackStartInfo;
}
self.setCurrentSrc = function (val, item, mediaSource, tracks) {