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 live stream termination

Browse source
This commit is contained in:
Luke Pulverenti 2015-04-13 12:21:10 -04:00
parent 24ea83ad5f
commit 95fe14c3ba
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -696,7 +696,7 @@
}); });
} }
function getLiveStream(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) { function getLiveStream(itemId, playSessionId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex) {
var postData = { var postData = {
DeviceProfile: deviceProfile, DeviceProfile: deviceProfile,
@ -706,7 +706,8 @@
var query = { var query = {
UserId: Dashboard.getCurrentUserId(), UserId: Dashboard.getCurrentUserId(),
StartTimeTicks: startPosition || 0, StartTimeTicks: startPosition || 0,
ItemId: itemId ItemId: itemId,
PlaySessionId: playSessionId
}; };
if (audioStreamIndex != null) { if (audioStreamIndex != null) {
@ -830,19 +831,20 @@
var deviceProfile = self.getDeviceProfile(); var deviceProfile = self.getDeviceProfile();
getPlaybackInfo(item.Id, deviceProfile, startPosition).done(function (result) { getPlaybackInfo(item.Id, deviceProfile, startPosition).done(function (playbackInfoResult) {
if (validatePlaybackInfoResult(result)) { if (validatePlaybackInfoResult(playbackInfoResult)) {
var mediaSource = getOptimalMediaSource(item.MediaType, result.MediaSources); var mediaSource = getOptimalMediaSource(item.MediaType, playbackInfoResult.MediaSources);
if (mediaSource) { if (mediaSource) {
if (mediaSource.RequiresOpening) { if (mediaSource.RequiresOpening) {
getLiveStream(item.Id, deviceProfile, startPosition, mediaSource, null, null).done(function (openLiveStreamResult) { getLiveStream(item.Id, playbackInfoResult.PlaySessionId, deviceProfile, startPosition, mediaSource, null, null).done(function (openLiveStreamResult) {
openLiveStreamResult.MediaSource.enableDirectPlay = supportsDirectPlay(openLiveStreamResult.MediaSource); openLiveStreamResult.MediaSource.enableDirectPlay = supportsDirectPlay(openLiveStreamResult.MediaSource);
playInternalPostMediaSourceSelection(item, openLiveStreamResult.MediaSource, startPosition, callback); playInternalPostMediaSourceSelection(item, openLiveStreamResult.MediaSource, startPosition, callback);
}); });