milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve moviedb issues

Browse source
This commit is contained in:
Luke Pulverenti 2014-10-07 21:37:45 -04:00
parent 21c5f51bb0
commit 12f4de7741
2 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -847,7 +847,7 @@
var bitrateSetting = AppSettings.maxStreamingBitrate();
var maxAllowedWidth = Math.max(screen.height, screen.width);
var maxAllowedWidth = self.getMaxPlayableWidth();
var options = [];
@ -1063,6 +1063,10 @@
EnableAutoStreamCopy: false
}));
if (isStatic && mediaSource.Protocol == 'Http' && !mediaSource.RequiredHttpHeaders.length) {
mp4VideoUrl = mediaSource.Path;
}
if (isStatic) {
mp4VideoUrl += seekParam;
} else {
@ -1218,6 +1222,8 @@
video.one("loadedmetadata.mediaplayerevent", function (e) {
// TODO: This is not working in chrome. Is it too early?
// Appending #t=xxx to the query string doesn't seem to work with HLS
if (startPositionInSeekParam && this.currentSrc && this.currentSrc.toLowerCase().indexOf('.m3u8') != -1) {
this.currentTime = startPositionInSeekParam;