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

omit query string from segments on roku

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-12 15:41:25 -05:00
parent b95f079a92
commit 64354206a0
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -202,7 +202,7 @@
profile.TranscodingProfiles = []; profile.TranscodingProfiles = [];
if (canPlayMkv) { if (canPlayMkv && !isVlc) {
profile.TranscodingProfiles.push({ profile.TranscodingProfiles.push({
Container: 'mkv', Container: 'mkv',
Type: 'Video', Type: 'Video',
@ -643,13 +643,13 @@
self.currentSubtitleStreamIndex = subtitleStreamIndex; self.currentSubtitleStreamIndex = subtitleStreamIndex;
changeStreamToUrl(mediaRenderer, playSessionId, streamInfo, streamInfo.startTimeTicksOffset || 0); changeStreamToUrl(mediaRenderer, playSessionId, streamInfo);
}); });
} }
}); });
}; };
function changeStreamToUrl(mediaRenderer, playSessionId, streamInfo, newPositionTicks) { function changeStreamToUrl(mediaRenderer, playSessionId, streamInfo) {
clearProgressInterval(); clearProgressInterval();
@ -670,15 +670,10 @@
if (self.currentItem.MediaType == "Video") { if (self.currentItem.MediaType == "Video") {
ApiClient.stopActiveEncodings(playSessionId).then(function () { ApiClient.stopActiveEncodings(playSessionId).then(function () {
//self.startTimeTicksOffset = newPositionTicks;
self.setSrcIntoRenderer(mediaRenderer, streamInfo, self.currentItem, self.currentMediaSource); self.setSrcIntoRenderer(mediaRenderer, streamInfo, self.currentItem, self.currentMediaSource);
}); });
self.startTimeTicksOffset = newPositionTicks || 0;
self.updateTextStreamUrls(newPositionTicks || 0);
} else { } else {
self.startTimeTicksOffset = newPositionTicks || 0;
self.setSrcIntoRenderer(mediaRenderer, streamInfo, self.currentItem, self.currentMediaSource); self.setSrcIntoRenderer(mediaRenderer, streamInfo, self.currentItem, self.currentMediaSource);
} }
} }
@ -707,8 +702,11 @@
}); });
} }
self.startTimeTicksOffset = streamInfo.startTimeTicksOffset || 0;
mediaRenderer.setCurrentSrc(streamInfo, item, mediaSource, tracks); mediaRenderer.setCurrentSrc(streamInfo, item, mediaSource, tracks);
self.streamInfo = streamInfo; self.streamInfo = streamInfo;
//self.updateTextStreamUrls(streamInfo.startTimeTicksOffset || 0);
}; };
self.setCurrentTime = function (ticks, positionSlider, currentTimeElement) { self.setCurrentTime = function (ticks, positionSlider, currentTimeElement) {
@ -968,8 +966,8 @@
if (mediaUrl.indexOf('.mkv') == -1) { if (mediaUrl.indexOf('.mkv') == -1) {
mediaUrl += '&EnableAutoStreamCopy=false'; mediaUrl += '&EnableAutoStreamCopy=false';
} }
startTimeTicksOffset = startPosition || 0; startTimeTicksOffset = startPosition || 0;
contentType = 'video/' + mediaSource.TranscodingContainer; contentType = 'video/' + mediaSource.TranscodingContainer;
} }
} }