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

sync updates

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-31 12:24:16 -04:00
parent e4e3ca4c5c
commit 69083dde3b
4 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -399,6 +399,7 @@
var currentSrc = element.currentSrc;
var playSessionId = getParameterByName('PlaySessionId', currentSrc);
var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
if (params.AudioStreamIndex == null && params.SubtitleStreamIndex == null && params.Bitrate == null) {
@ -419,14 +420,14 @@
subtitleStreamIndex = parseInt(subtitleStreamIndex);
}
getPlaybackInfo(self.currentItem.Id, deviceProfile, ticks, self.currentMediaSource, audioStreamIndex, subtitleStreamIndex).done(function (result) {
getPlaybackInfo(self.currentItem.Id, deviceProfile, ticks, self.currentMediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId).done(function (result) {
if (validatePlaybackInfoResult(result)) {
self.currentMediaSource = result.MediaSources[0];
self.currentSubtitleStreamIndex = subtitleStreamIndex;
currentSrc = ApiClient.getUrl(self.currentMediaSource.TranscodingUrl);
currentSrc = self.currentMediaSource.TranscodingUrl;
changeStreamToUrl(element, playSessionId, currentSrc, ticks);
}
});
@ -660,7 +661,7 @@
})[0];
}
function getPlaybackInfo(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) {
function getPlaybackInfo(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId) {
var postData = {
DeviceProfile: deviceProfile
@ -680,6 +681,9 @@
if (mediaSource) {
query.MediaSourceId = mediaSource.Id;
}
if (liveStreamId) {
query.LiveStreamId = liveStreamId;
}
return ApiClient.ajax({
url: ApiClient.getUrl('Items/' + itemId + '/PlaybackInfo', query),
@ -750,7 +754,7 @@
} else {
startTimeTicksOffset = startPosition || 0;
mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
mediaUrl = mediaSource.TranscodingUrl;
if (mediaSource.TranscodingSubProtocol == 'hls') {
@ -789,7 +793,7 @@
contentType = 'audio/' + mediaSource.TranscodingContainer;
mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
mediaUrl = mediaSource.TranscodingUrl;
}
startTimeTicksOffset = startPosition || 0;