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

rework transcoding settings

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-30 21:52:11 -04:00
parent 5439ca56b6
commit a1890b0e4e
8 changed files with 60 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -640,7 +640,7 @@
ApiClient.stopActiveEncodings(playSessionId).done(function () {
//self.startTimeTicksOffset = newPositionTicks;
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
self.setSrcIntoRenderer(mediaRenderer, url, self.currentItem, self.currentMediaSource);
});
@ -648,10 +648,37 @@
self.updateTextStreamUrls(newPositionTicks || 0);
} else {
self.startTimeTicksOffset = newPositionTicks || 0;
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
self.setSrcIntoRenderer(mediaRenderer, url, self.currentItem, self.currentMediaSource);
}
}
self.setSrcIntoRenderer = function (mediaRenderer, url, item, mediaSource) {
var subtitleStreams = mediaSource.MediaStreams.filter(function (s) {
return s.Type == 'Subtitle';
});
var textStreams = subtitleStreams.filter(function (s) {
return s.DeliveryMethod == 'External';
});
var tracks = [];
for (var i = 0, length = textStreams.length; i < length; i++) {
var textStream = textStreams[i];
var textStreamUrl = !textStream.IsExternalUrl ? ApiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
tracks.push({
url: textStreamUrl,
language: (textStream.Language || 'und'),
isDefault: textStream.Index == mediaSource.DefaultSubtitleStreamIndex
});
}
mediaRenderer.setCurrentSrc(url, item, mediaSource, tracks);
};
self.setCurrentTime = function (ticks, positionSlider, currentTimeElement) {
// Convert to ticks