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-30 15:57:37 -04:00
parent 4ffd893f3e
commit e4e3ca4c5c
3 changed files with 15 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/addpluginpage.js
View file

@ -266,7 +266,7 @@
}); });
}).on('pagebeforeshow pageinit', "#addPluginPage", function () { }).on('pagebeforeshow pageinit pageshow', "#addPluginPage", function () {
// This needs both events for the helpurl to get done at the right time // This needs both events for the helpurl to get done at the right time

2
dashboard-ui/scripts/appservices.js
View file

@ -66,7 +66,7 @@
} }
$(document).on('pagebeforeshow pageinit', "#appServicesPage", function () { $(document).on('pagebeforeshow pageinit pageshow', "#appServicesPage", function () {
// This needs both events for the helpurl to get done at the right time // This needs both events for the helpurl to get done at the right time

37
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -143,10 +143,6 @@
self.changeStream(self.getCurrentTicks(), { AudioStreamIndex: index }); self.changeStream(self.getCurrentTicks(), { AudioStreamIndex: index });
}; };
self.supportsSubtitleStreamExternally = function (stream) {
return stream.Type == 'Subtitle' && stream.IsTextSubtitleStream && stream.SupportsExternalStream;
}
self.setSubtitleStreamIndex = function (index) { self.setSubtitleStreamIndex = function (index) {
if (!self.supportsTextTracks()) { if (!self.supportsTextTracks()) {
@ -166,7 +162,7 @@
if (currentStream && !newStream) { if (currentStream && !newStream) {
if (!self.supportsSubtitleStreamExternally(currentStream)) { if (currentStream.DeliveryMethod != 'External') {
// Need to change the transcoded stream to remove subs // Need to change the transcoded stream to remove subs
self.changeStream(self.getCurrentTicks(), { SubtitleStreamIndex: -1 }); self.changeStream(self.getCurrentTicks(), { SubtitleStreamIndex: -1 });
@ -174,7 +170,7 @@
} }
else if (!currentStream && newStream) { else if (!currentStream && newStream) {
if (self.supportsSubtitleStreamExternally(newStream)) { if (newStream.DeliveryMethod == 'External') {
selectedTrackElementIndex = index; selectedTrackElementIndex = index;
} else { } else {
@ -184,10 +180,10 @@
} }
else if (currentStream && newStream) { else if (currentStream && newStream) {
if (self.supportsSubtitleStreamExternally(newStream)) { if (newStream.DeliveryMethod == 'External') {
selectedTrackElementIndex = index; selectedTrackElementIndex = index;
if (!self.supportsSubtitleStreamExternally(currentStream)) { if (currentStream.DeliveryMethod != 'External') {
self.changeStream(self.getCurrentTicks(), { SubtitleStreamIndex: -1 }); self.changeStream(self.getCurrentTicks(), { SubtitleStreamIndex: -1 });
} }
} else { } else {
@ -207,7 +203,7 @@
var modes = ['disabled', 'showing', 'hidden']; var modes = ['disabled', 'showing', 'hidden'];
var textStreams = self.currentMediaSource.MediaStreams.filter(function (s) { var textStreams = self.currentMediaSource.MediaStreams.filter(function (s) {
return self.supportsSubtitleStreamExternally(s); return s.DeliveryMethod == 'External';
}); });
var newStream = textStreams.filter(function (s) { var newStream = textStreams.filter(function (s) {
@ -963,25 +959,18 @@
html += '<source type="' + contentType + '" src="' + videoUrl + '" />'; html += '<source type="' + contentType + '" src="' + videoUrl + '" />';
if (self.supportsTextTracks()) { var textStreams = subtitleStreams.filter(function (s) {
var textStreams = subtitleStreams.filter(function (s) { return s.DeliveryMethod == 'External';
return self.supportsSubtitleStreamExternally(s); });
});
for (var i = 0, length = textStreams.length; i < length; i++) { for (var i = 0, length = textStreams.length; i < length; i++) {
var textStream = textStreams[i]; var textStream = textStreams[i];
var textStreamUrl = mediaSource.Protocol == 'Http' ? var textStreamUrl = textStream.DeliveryUrl;
textStream.Path :
ApiClient.getUrl('Videos/' + item.Id + '/' + mediaSource.Id + '/Subtitles/' + textStream.Index + '/Stream.vtt', {
startPositionTicks: (startPosition || 0),
api_key: ApiClient.accessToken()
});
var defaultAttribute = textStream.Index == mediaSource.DefaultSubtitleStreamIndex ? ' default' : ''; var defaultAttribute = textStream.Index == mediaSource.DefaultSubtitleStreamIndex ? ' default' : '';
html += '<track kind="subtitles" src="' + textStreamUrl + '" srclang="' + (textStream.Language || 'und') + '"' + defaultAttribute + '></track>'; html += '<track kind="subtitles" src="' + textStreamUrl + '" srclang="' + (textStream.Language || 'und') + '"' + defaultAttribute + '></track>';
}
} }
html += '</video>'; html += '</video>';