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-15 14:09:44 -04:00
parent 4ed9e6d637
commit 39d4daa2fb
10 changed files with 78 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@
}
};
function getPlaybackStartInfoForVideoActivity(videoUrl, mediaSource, item) {
function getPlaybackStartInfoForVideoActivity(streamInfo, mediaSource, item) {
var playbackStartInfo = {
QueueableMediaTypes: item.MediaType,
@ -103,20 +103,21 @@
playbackStartInfo.NowPlayingItem.RunTimeTicks = mediaSource.RunTimeTicks;
}
var videoUrl = streamInfo.url;
var audioStreamIndex = getParameterByName('AudioStreamIndex', videoUrl);
if (audioStreamIndex) {
playbackStartInfo.AudioStreamIndex = parseInt(audioStreamIndex);
}
if (self.currentSubtitleStreamIndex != null) {
playbackStartInfo.SubtitleStreamIndex = self.currentSubtitleStreamIndex;
// TODO: This should be passed in rather than going out to get it
if (MediaPlayer.currentSubtitleStreamIndex != null) {
playbackStartInfo.SubtitleStreamIndex = MediaPlayer.currentSubtitleStreamIndex;
}
playbackStartInfo.PlayMethod = getParameterByName('static', videoUrl) == 'true' ?
'DirectStream' :
'Transcode';
playbackStartInfo.PlayMethod = streamInfo.playMethod;
playbackStartInfo.LiveStreamId = getParameterByName('LiveStreamId', videoUrl);
playbackStartInfo.LiveStreamId = mediaSource.LiveStreamId;
playbackStartInfo.PlaySessionId = getParameterByName('PlaySessionId', videoUrl);
// Seeing some deserialization errors around this property
@ -127,13 +128,14 @@
return playbackStartInfo;
}
self.setCurrentSrc = function (val, item, mediaSource, tracks) {
self.setCurrentSrc = function (streamInfo, item, mediaSource, tracks) {
if (!val) {
if (!streamInfo) {
self.destroy();
return;
}
var val = streamInfo.url;
var tIndex = val.indexOf('#t=');
var startPosMs = 0;
@ -148,7 +150,7 @@
AndroidVlcPlayer.playAudioVlc(val, JSON.stringify(item), JSON.stringify(mediaSource), options.poster);
} else {
var playbackStartInfo = getPlaybackStartInfoForVideoActivity(val, mediaSource, item);
var playbackStartInfo = getPlaybackStartInfoForVideoActivity(streamInfo, mediaSource, item);
var serverUrl = ApiClient.serverAddress();

9
dashboard-ui/cordova/localassetmanager.js vendored
View file

@ -2,16 +2,21 @@
function getLocalMediaSource(serverId, itemId) {
var deferred = DeferredBuilder.Deferred();
// android
if (window.ApiClientBridge) {
var json = ApiClientBridge.getLocalMediaSource(serverId, itemId);
if (json) {
return JSON.parse(json);
deferred.resolveWith(null, [JSON.parse(json)]);
}
else {
deferred.resolveWith(null, [null]);
}
return deferred.promise();
}
var deferred = DeferredBuilder.Deferred();
getLocalItem(itemId, serverId).done(function (localItem) {
if (localItem && localItem.MediaSources.length) {