wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1061 from MediaBrowser/master

Browse Source 
resolve reverse proxy issue
This commit is contained in:
Luke
2015-04-01 22:53:01 -04:00
parent ff0a9b6837 9e547131ef
commit 6d7cf16fa7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard-ui/scripts/mediaplayer-video.js
+1 -1
View File
@@ -966,7 +966,7 @@
for (var i = 0, length = textStreams.length; i < length; i++) {
var textStream = textStreams[i];
var textStreamUrl = textStream.DeliveryUrl;
var textStreamUrl = !textStream.IsExternalUrl ? ApiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
var defaultAttribute = textStream.Index == mediaSource.DefaultSubtitleStreamIndex ? ' default' : '';
html += '<track kind="subtitles" src="' + textStreamUrl + '" srclang="' + (textStream.Language || 'und') + '"' + defaultAttribute + '></track>';
dashboard-ui/scripts/mediaplayer.js
+3 -3
View File
@@ -427,7 +427,7 @@
self.currentMediaSource = result.MediaSources[0];
self.currentSubtitleStreamIndex = subtitleStreamIndex;
currentSrc = self.currentMediaSource.TranscodingUrl;
currentSrc = ApiClient.getUrl(self.currentMediaSource.TranscodingUrl);
changeStreamToUrl(element, playSessionId, currentSrc, ticks);
}
});
@@ -754,7 +754,7 @@
} else {
startTimeTicksOffset = startPosition || 0;
mediaUrl = mediaSource.TranscodingUrl;
mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
if (mediaSource.TranscodingSubProtocol == 'hls') {
@@ -793,7 +793,7 @@
contentType = 'audio/' + mediaSource.TranscodingContainer;
mediaUrl = mediaSource.TranscodingUrl;
mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
}
startTimeTicksOffset = startPosition || 0;